Return proper output of factory

poseidon-fisheries · Nov 28, 2023 · e85f18a · e85f18a
1 parent 416546c
commit e85f18a
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/...ox/oxfish/fisher/purseseiner/fads/WeibullPerSpeciesCarryingCapacitiesFromFileFactory.java b/...ox/oxfish/fisher/purseseiner/fads/WeibullPerSpeciesCarryingCapacitiesFromFileFactory.java
@@ -19,7 +19,7 @@ public class WeibullPerSpeciesCarryingCapacitiesFromFileFactory
 
     private DoubleParameter scalingFactor;
     private IntegerParameter targetYear;
-    private final InputPath fadCarryingCapacityFile;
+    private InputPath fadCarryingCapacityFile;
 
     public WeibullPerSpeciesCarryingCapacitiesFromFileFactory(
         final InputPath fadCarryingCapacityFile,
@@ -58,13 +58,20 @@ record -> new FixedDoubleParameter(record.getDouble("probability_of_zeros"))
                 )
             );
 
-        new WeibullPerSpeciesCarryingCapacitiesFactory(
+        return new WeibullPerSpeciesCarryingCapacitiesFactory(
             yearShapeParameters,
             yearScaleParameters,
             yearProportionOfZeros,
             scalingFactor
-        );
-        return null;
+        ).apply(fishState);
+    }
+
+    public DoubleParameter getScalingFactor() {
+        return scalingFactor;
+    }
+
+    public void setScalingFactor(final DoubleParameter scalingFactor) {
+        this.scalingFactor = scalingFactor;
     }
 
     public IntegerParameter getTargetYear() {
@@ -75,14 +82,12 @@ public void setTargetYear(final IntegerParameter targetYear) {
         this.targetYear = targetYear;
     }
 
-
-    public DoubleParameter getScalingFactor() {
-        return scalingFactor;
+    public InputPath getFadCarryingCapacityFile() {
+        return fadCarryingCapacityFile;
     }
 
-    public void setScalingFactor(final DoubleParameter scalingFactor) {
-        this.scalingFactor = scalingFactor;
+    public void setFadCarryingCapacityFile(final InputPath fadCarryingCapacityFile) {
+        this.fadCarryingCapacityFile = fadCarryingCapacityFile;
     }
 
-
 }