Update DemandExpressionHandling.cpp

James Craig · James Craig · commit 0585bf23af6b · 2025-01-29T12:05:12.000-05:00
proper handling of DAY_OF_YEAR wraparound with IS_BETWEEN clause
diff --git a/src/DemandExpressionHandling.cpp b/src/DemandExpressionHandling.cpp
@@ -1162,11 +1162,11 @@ bool CDemandOptimizer::CheckOpRegimeConditions(const op_regime *pOperRegime, con
 
       if (comp == COMPARE_BETWEEN)
       {
-        if ((pCond->dv_name == "DAY_OF_YEAR") || (pCond->dv_name =="MONTH")) { //handles wraparound
-          if ( v2 < v ){
-            if ((dv_value > v ) && (dv_value < v2)){return false;}
+        if ((pCond->dv_name == "DAY_OF_YEAR") || (pCond->dv_name =="MONTH") || (pCond->dv_name=="YEAR")) { //handles wraparound
+          if ( v2 < v ){ // wraparound
+            if ((dv_value < v ) && (dv_value > v2)){return false;} //integer values - this is inclusive of end dates
           }
-          else {
+          else { //regular
             if ((dv_value > v2) || (dv_value < v )){return false;}
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -1162,11 +1162,11 @@ bool CDemandOptimizer::CheckOpRegimeConditions(const op_regime *pOperRegime, con`
`1162`	`1162`
`1163`	`1163`	`if (comp == COMPARE_BETWEEN)`
`1164`	`1164`	`{`
`1165`		`- if ((pCond->dv_name == "DAY_OF_YEAR") \|\| (pCond->dv_name =="MONTH")) { //handles wraparound`
`1166`		`- if ( v2 < v ){`
`1167`		`- if ((dv_value > v ) && (dv_value < v2)){return false;}`
	`1165`	`+ if ((pCond->dv_name == "DAY_OF_YEAR") \|\| (pCond->dv_name =="MONTH") \|\| (pCond->dv_name=="YEAR")) { //handles wraparound`
	`1166`	`+ if ( v2 < v ){ // wraparound`
	`1167`	`+ if ((dv_value < v ) && (dv_value > v2)){return false;} //integer values - this is inclusive of end dates`
`1168`	`1168`	`}`
`1169`		`- else {`
	`1169`	`+ else { //regular`
`1170`	`1170`	`if ((dv_value > v2) \|\| (dv_value < v )){return false;}`
`1171`	`1171`	`}`
`1172`	`1172`	`}`