Circular: Implement driving distances

test/fixtures/simple.json

@@ -2,7 +2,7 @@
   "parameters": {
     "time horizon (years)": 4,
     "building period (years)": [1],
-    "distance metric": "driving"
+    "distance metric": "euclidean"
   },
   "products": {
     "P1": {

test/src/instance/parse_test.jl

@@ -8,7 +8,7 @@ function instance_parse_test_1()
     # Parameters
     @test instance.time_horizon == 4
     @test instance.building_period == [1]
-    @test instance.distance_metric == "driving"
+    @test instance.distance_metric isa RELOG.EuclideanDistance
 
     # Products
     @test length(instance.products) == 4

test/src/model/dist_test.jl

@@ -6,5 +6,8 @@ using RELOG
 
 function model_dist_test()
     # Euclidean distance between Chicago and Indianapolis
-    @test RELOG._calculate_distance(41.866, -87.656, 39.764, -86.148) == 265.818
+    @test RELOG._calculate_distance(41.866, -87.656, 39.764, -86.148, RELOG.EuclideanDistance()) == 265.818
+
+    # Driving distance between Chicago and Indianapolis
+    @test RELOG._calculate_distance(41.866, -87.656, 39.764, -86.148, RELOG.KnnDrivingDistance()) == 316.43
 end

test/src/reports_test.jl

@@ -3,6 +3,7 @@ function report_tests()
     instance = RELOG.parsefile(fixture("boat_example.json"))
     model = RELOG.build_model(instance, optimizer = HiGHS.Optimizer, variable_names = true)
     optimize!(model)
+    mkpath("tmp")
     write_to_file(model, "tmp/model.lp")
     RELOG.write_plants_report(model, "tmp/plants.csv")
     RELOG.write_plant_outputs_report(model, "tmp/plant_outputs.csv")