committing updates for supply chain and recruitment test fix

poseidon-fisheries · Oct 6, 2023 · aff4669 · aff4669
1 parent 8396718
commit aff4669
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/POSEIDON/build.gradle b/POSEIDON/build.gradle
@@ -89,6 +89,9 @@ dependencies {
     // Reference implementation of JSR-385 for units of measure
     implementation 'si.uom:si-quantity:2.1'
     implementation 'si.uom:si-units:2.1'
+
+    //Google OR tools for solving Linear Programs
+    implementation 'com.google.ortools:ortools-java:9.6.2534'
 }
 
 processTestResources.doFirst {

diff --git a/POSEIDON/src/main/java/uk/ac/ox/oxfish/model/scenario/EpoAbundanceScenario.java b/POSEIDON/src/main/java/uk/ac/ox/oxfish/model/scenario/EpoAbundanceScenario.java
@@ -39,7 +39,7 @@ public EpoAbundanceScenario() {
                 ),
                 DEFAULT_MAP_EXTENT_FACTORY,
                 new RecruitmentProcessesFactory(
-                    abundanceInputFolder.path("recruitment_parameters.csv")
+                    abundanceInputFolder.path("recruitment_parameters_2022.csv")
                 )
             )
         );