Replace VriAdjustInputWriter with VdypOutputWriter and remove VRI_OUT…

…PUT control keys (duplication)
bcgov · Sep 10, 2024 · ff1731d · ff1731d
1 parent b1b7d54
commit ff1731d
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 287 deletions.
diff --git a/vdyp-lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/application/VdypStartApplication.java b/vdyp-lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/application/VdypStartApplication.java
@@ -48,7 +48,7 @@
 import ca.bc.gov.nrs.vdyp.io.parse.control.BaseControlParser;
 import ca.bc.gov.nrs.vdyp.io.parse.streaming.StreamingParser;
 import ca.bc.gov.nrs.vdyp.io.parse.streaming.StreamingParserFactory;
-import ca.bc.gov.nrs.vdyp.io.write.VriAdjustInputWriter;
+import ca.bc.gov.nrs.vdyp.io.write.VdypOutputWriter;
 import ca.bc.gov.nrs.vdyp.math.FloatMath;
 import ca.bc.gov.nrs.vdyp.model.BaseVdypLayer;
 import ca.bc.gov.nrs.vdyp.model.BaseVdypPolygon;
@@ -165,7 +165,7 @@ protected static void doMain(VdypStartApplication<?, ?, ?, ?> app, final String.
 				.filter(x -> !x.getName().contains("Volume")).toList();
 	}
 
-	protected VriAdjustInputWriter vriWriter;
+	protected VdypOutputWriter vriWriter;
 
 	protected Map<String, Object> controlMap = new HashMap<>();
 
@@ -227,7 +227,7 @@ public void init(FileSystemFileResolver resolver, Map<String, Object> controlMap
 
 		setControlMap(controlMap);
 		closeVriWriter();
-		vriWriter = new VriAdjustInputWriter(controlMap, resolver);
+		vriWriter = new VdypOutputWriter(controlMap, resolver);
 	}
 
 	protected abstract BaseControlParser getControlFileParser();
@@ -508,7 +508,7 @@ public int findEmpiricalRelationshipParameterIndex(String specAlias, BecDefiniti
 		return group;
 	}
 
-	protected VriAdjustInputWriter getVriWriter() {
+	protected VdypOutputWriter getVriWriter() {
 		return vriWriter;
 	}
 

diff --git a/vdyp-lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/common/ControlKey.java b/vdyp-lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/common/ControlKey.java
@@ -20,9 +20,7 @@ public enum ControlKey {
 	FORWARD_INPUT_GROWTO(14),
 
 	// FIP/VRI Outputs
-	VRI_OUTPUT_VDYP_POLYGON(15), VRI_OUTPUT_VDYP_LAYER_BY_SPECIES(16), VRI_OUTPUT_VDYP_LAYER_BY_SP0_BY_UTIL(18),
-
-	// VDYP Forward Outputs
+	// VDYP Forward, Bank and Adjust Inputs and Outputs
 	VDYP_OUTPUT_VDYP_POLYGON(15), VDYP_OUTPUT_VDYP_LAYER_BY_SPECIES(16), VDYP_OUTPUT_VDYP_LAYER_BY_SP0_BY_UTIL(18),
 	VDYP_OUTPUT_COMPATIBILITY_VARIABLES(19),
 

diff --git a/vdyp-lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/io/write/VdypOutputWriter.java b/vdyp-lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/io/write/VdypOutputWriter.java
@@ -113,9 +113,9 @@ public VdypOutputWriter(Map<String, Object> controlMap, FileResolver resolver) t
 				getOutputStream(controlMap, resolver, ControlKey.VDYP_OUTPUT_VDYP_POLYGON.name()),
 				getOutputStream(controlMap, resolver, ControlKey.VDYP_OUTPUT_VDYP_LAYER_BY_SPECIES.name()),
 				getOutputStream(controlMap, resolver, ControlKey.VDYP_OUTPUT_VDYP_LAYER_BY_SP0_BY_UTIL.name()),
-				Optional.of(
+				controlMap.containsKey(ControlKey.VDYP_OUTPUT_COMPATIBILITY_VARIABLES.name()) ? Optional.of(
 						getOutputStream(controlMap, resolver, ControlKey.VDYP_OUTPUT_COMPATIBILITY_VARIABLES.name())
-				)
+				) : Optional.empty()
 		);
 	}
 

diff --git a/vdyp-lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/io/write/VriAdjustInputWriter.java b/vdyp-lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/io/write/VriAdjustInputWriter.java
diff --git a/...ib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/application/VdypStartApplicationTest.java b/...ib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/application/VdypStartApplicationTest.java
@@ -111,9 +111,9 @@ void testInitNoControlFiles() throws IOException, ResourceParseException {
 	}
 
 	private MockFileResolver dummyIo() {
-		controlMap.put(ControlKey.VRI_OUTPUT_VDYP_POLYGON.name(), "DUMMY1");
-		controlMap.put(ControlKey.VRI_OUTPUT_VDYP_LAYER_BY_SPECIES.name(), "DUMMY2");
-		controlMap.put(ControlKey.VRI_OUTPUT_VDYP_LAYER_BY_SP0_BY_UTIL.name(), "DUMMY3");
+		controlMap.put(ControlKey.VDYP_OUTPUT_VDYP_POLYGON.name(), "DUMMY1");
+		controlMap.put(ControlKey.VDYP_OUTPUT_VDYP_LAYER_BY_SPECIES.name(), "DUMMY2");
+		controlMap.put(ControlKey.VDYP_OUTPUT_VDYP_LAYER_BY_SP0_BY_UTIL.name(), "DUMMY3");
 
 		MockFileResolver resolver = new MockFileResolver("Test");
 		resolver.addStream("DUMMY1", (OutputStream) new ByteArrayOutputStream());