adding multiple capacity vehicle capability #29

Abhishekrana254 · 2017-07-28T21:05:00Z

No description provided.

daniel-j-h · 2017-08-07T09:57:21Z

src/adaptors.h

@@ -134,11 +134,30 @@ template <typename Vector> inline auto makeVectorFromJsNumberArray(v8::Local<v8:

    if (!num->IsNumber())
      throw std::runtime_error{"Expected array element of types Number"};
-
+      //std::cout<<"hello"<<std::endl;


The debug prints and the include above have to go before we can merge this

daniel-j-h · 2017-08-07T09:57:59Z

src/adaptors.h

    vec.at(atIdx) = Nan::To<std::int32_t>(num).FromJust();
  }

  return vec;
 }

+// our function for changing js array into  vector of long long int
+
+template <typename Vector> inline auto makeVectorFromJsNumberArray1(v8::Local<v8::Array> array) {


Why is this function needed?

daniel-j-h · 2017-08-07T09:59:12Z

src/tsp_worker.h

@@ -10,33 +10,40 @@
 #include <utility>
 #include <vector>

-struct TSPWorker final : Nan::AsyncWorker {
-  using Base = Nan::AsyncWorker;
+struct TSPWorker final {


Why did you remove this and no longer initialize the base class below? The base class already stores the callback, there should be no need to store it here.

daniel-j-h · 2017-08-07T09:59:48Z

src/tsp_worker.h


-  void Execute() override {
+  void Execute() {


Please inherit from the NAN AsyncWorker and keep the overrides here and below.

daniel-j-h · 2017-08-07T10:00:00Z

src/vrp_params.h

@@ -25,7 +25,7 @@ struct VRPSearchParams {
  std::int32_t numVehicles;
  std::int32_t depotNode;
  std::int32_t timeHorizon;
-  std::int32_t vehicleCapacity;
+  std::vector<int64> vehicleCapacity;   // type changed to vector 


remove comment

daniel-j-h · 2017-08-07T10:00:20Z

src/vrp_params.h

-  if (static_cast<std::int32_t>(array->Length()) != n)
-    throw std::runtime_error{"Array dimension do not match size"};
+  // if (static_cast<std::int32_t>(array->Length()) != n)
+  //   throw std::runtime_error{"Array dimension do not match size"};


Why commented out?

daniel-j-h · 2017-08-07T10:00:51Z

src/vrp_params.h

+    else if(!costMatrixOk) throw std::runtime_error{"ERROR TYPE 2"};
+      else if(!durationMatrixOk) throw std::runtime_error{"ERROR TYPE 3"};
+        else if(!timeWindowsVectorOk) throw std::runtime_error{"ERROR TYPE 4"};
+          else if(!demandMatrixOk) throw std::runtime_error{"ERROR TYPE 5"};


What's going on here?

daniel-j-h · 2017-08-07T10:01:06Z

src/vrp_params.h

@@ -170,7 +177,7 @@ VRPSearchParams::VRPSearchParams(const Nan::FunctionCallbackInfo<v8::Value>& inf
  auto numVehiclesOk = !maybeNumVehicles.IsEmpty() && maybeNumVehicles.ToLocalChecked()->IsNumber();
  auto depotNodeOk = !maybeDepotNode.IsEmpty() && maybeDepotNode.ToLocalChecked()->IsNumber();
  auto timeHorizonOk = !maybeTimeHorizon.IsEmpty() && maybeTimeHorizon.ToLocalChecked()->IsNumber();
-  auto vehicleCapacityOk = !maybeVehicleCapacity.IsEmpty() && maybeVehicleCapacity.ToLocalChecked()->IsNumber();
+  auto vehicleCapacityOk = !maybeVehicleCapacity.IsEmpty() && maybeVehicleCapacity.ToLocalChecked()->IsArray();  // IsNumber() changed to IsArray()


remove comment

daniel-j-h · 2017-08-07T10:01:21Z

src/vrp_params.h

@@ -192,7 +199,9 @@ VRPSearchParams::VRPSearchParams(const Nan::FunctionCallbackInfo<v8::Value>& inf
  numVehicles = Nan::To<std::int32_t>(maybeNumVehicles.ToLocalChecked()).FromJust();
  depotNode = Nan::To<std::int32_t>(maybeDepotNode.ToLocalChecked()).FromJust();
  timeHorizon = Nan::To<std::int32_t>(maybeTimeHorizon.ToLocalChecked()).FromJust();
-  vehicleCapacity = Nan::To<std::int32_t>(maybeVehicleCapacity.ToLocalChecked()).FromJust();
+  //vehicleCapacity = Nan::To<std::int32_t>(maybeVehicleCapacity.ToLocalChecked()).FromJust();


Why commented out?

daniel-j-h · 2017-08-07T10:01:46Z

src/vrp_worker.h

@@ -32,7 +32,7 @@ struct VRPWorker final : Nan::AsyncWorker {
            std::int32_t numVehicles_,                        //
            std::int32_t vehicleDepot_,                       //
            std::int32_t timeHorizon_,                        //
-            std::int32_t vehicleCapacity_,                    //
+            std::vector<int64> vehicleCapacity_,              //   type changed to vector int64


Why the change from int32s to int64s?

it was because the AddDimensionWithVehicleCapacity() takes long long integer array

adding multiple capacity vehicle capability

f6901de

daniel-j-h suggested changes Aug 7, 2017

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

adding multiple capacity vehicle capability #29

adding multiple capacity vehicle capability #29

Abhishekrana254 commented Jul 28, 2017

daniel-j-h Aug 7, 2017

daniel-j-h Aug 7, 2017

daniel-j-h Aug 7, 2017

daniel-j-h Aug 7, 2017

daniel-j-h Aug 7, 2017

daniel-j-h Aug 7, 2017

daniel-j-h Aug 7, 2017

daniel-j-h Aug 7, 2017

daniel-j-h Aug 7, 2017

daniel-j-h Aug 7, 2017

Abhishekrana254 Aug 9, 2017

adding multiple capacity vehicle capability #29

Are you sure you want to change the base?

adding multiple capacity vehicle capability #29

Conversation

Abhishekrana254 commented Jul 28, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment