#6: Remove curve specific models and use expression based DFR3Curve c…

…lass for all curves in DFR3

server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/models/FragilityCurveParameter.java → server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/models/CurveParameter.java

@@ -12,17 +12,17 @@
 import dev.morphia.annotations.Embedded;
 
 @Embedded
-public class FragilityCurveParameter {
+public class CurveParameter {
     public String name;
     public String unit;
     public String description;
     public String fullName;
     public String expression;
 
-    public FragilityCurveParameter() {
+    public CurveParameter() {
     }
 
-    public FragilityCurveParameter(String name, String unit, String description, String fullName, String expression) {
+    public CurveParameter(String name, String unit, String description, String fullName, String expression) {
         this.name = name;
         this.unit = unit;
         this.description = description;

server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/models/FragilityCurve.java → server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/models/DFR3Curve.java

@@ -14,13 +14,13 @@
 import java.util.List;
 
 @Embedded
-public class FragilityCurve {
+public class DFR3Curve {
     public String description;
     public List<Rule> rules;
     public ReturnType returnType;
-    public List<FragilityCurveParameter> fragilityCurveParameters;
+    public List<CurveParameter> curveParameters;
 
-    public FragilityCurve() {
+    public DFR3Curve() {
 
     }
 
@@ -48,12 +48,12 @@ public void setReturnType(ReturnType returnType) {
         this.returnType = returnType;
     }
 
-    public List<FragilityCurveParameter> getFragilityCurveParameters() {
-        return fragilityCurveParameters;
+    public List<CurveParameter> getFragilityCurveParameters() {
+        return curveParameters;
     }
 
-    public void setFragilityCurveParameters(List<FragilityCurveParameter> fragilityCurveParameters) {
-        this.fragilityCurveParameters = fragilityCurveParameters;
+    public void setFragilityCurveParameters(List<CurveParameter> curveParameters) {
+        this.curveParameters = curveParameters;
     }
 
 }

server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/models/DFR3Set.java

@@ -34,6 +34,8 @@ public abstract class DFR3Set {
 
     protected String creator;
 
+    protected List<CurveParameter> curveParameters;
+
     /**
      * spaces the object belongs to. Calculated at runtime.
      */
@@ -91,4 +93,13 @@ public List<String> getSpaces() {
     public void setSpaces(List<String> spaces) {
         this.spaces = spaces;
     }
+
+    public List<CurveParameter> getCurveParameters() {
+        return curveParameters;
+    }
+
+    public void setCurveParameters(List<CurveParameter> curveParameters) {
+        this.curveParameters = curveParameters;
+    }
+
 }

server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/models/FragilitySet.java

@@ -17,8 +17,7 @@
 public class FragilitySet extends DFR3Set {
     protected List<String> demandTypes;
     protected List<String> demandUnits;
-    protected List<FragilityCurve> fragilityCurves;
-    protected List<FragilityCurveParameter> fragilityCurveParameters;
+    protected List<DFR3Curve> fragilityCurves;
 
     public List<String> getDemandTypes() {
         return demandTypes;
@@ -36,12 +35,8 @@ public void setDemandUnits(List<String> demandUnits) {
         this.demandUnits = demandUnits;
     }
 
-    public List<FragilityCurve> getFragilityCurves() {
+    public List<DFR3Curve> getFragilityCurves() {
         return fragilityCurves;
     }
 
-    public List<FragilityCurveParameter> getFragilityCurveParameters() {
-        return fragilityCurveParameters;
-    }
-
 }

server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/models/RepairSet.java

@@ -17,13 +17,14 @@
 public class RepairSet extends DFR3Set {
 
     private String timeUnits;
-    private List<RepairCurve> repairCurves;
+    private List<DFR3Curve> repairCurves;
 
     public String getTimeUnits() {
         return timeUnits;
     }
 
-    public List<RepairCurve> getRepairCurves() {
+    public List<DFR3Curve> getRepairCurves() {
         return repairCurves;
     }
+
 }

server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/models/RestorationSet.java

@@ -17,13 +17,13 @@
 public class RestorationSet extends DFR3Set {
 
     private String timeUnits;
-    private List<RestorationCurve> restorationCurves;
+    private List<DFR3Curve> restorationCurves;
 
     public String getTimeUnits() {
         return timeUnits;
     }
 
-    public List<RestorationCurve> getRestorationCurves() {
+    public List<DFR3Curve> getRestorationCurves() {
         return restorationCurves;
     }
 }