modified validation, error scripts

src/model/build.jl

@@ -33,15 +33,15 @@ function build_model(;
     variable_names::Bool = false,
 )::JuMP.Model
     if formulation.ramping == WanHob2016.Ramping() &&
-       instance.reserves.spinning != zeros(instance.time)
+        instance.reserves.spinning >= ones(instance.time).*1e-6
         error(
             "Spinning reserves are not supported by the WanHob2016 ramping formulation",
         )
     end
-    @show formulation.ramping
+    
     if formulation.ramping !== WanHob2016.Ramping() && (
-        instance.reserves.upflexiramp != zeros(instance.time) ||
+        instance.reserves.upflexiramp >= ones(instance.time).*1e-6 ||
-        instance.reserves.dwflexiramp != zeros(instance.time)
+        instance.reserves.dwflexiramp >= ones(instance.time).*1e-6
     )
         error(
             "Flexiramp is supported only by the WanHob2016 ramping formulation",

src/validation/validate.jl

@@ -324,61 +324,63 @@ function _validate_reserve_and_demand(instance, solution, tol = 0.01)
         
         # Verify flexiramp solutions only if either of the up-flexiramp and  
         # down-flexiramp requirements is not a default array of zeros
-        if instance.reserves.upflexiramp != zeros(T) || instance.reserves.dwflexiramp != zeros(T)
+        if instance.reserves.upflexiramp != zeros(instance.time) || instance.reserves.dwflexiramp != zeros(instance.time)
             upflexiramp =
             sum(solution["Up-flexiramp (MW)"][g.name][t] for g in instance.units)
-        upflexiramp_shortfall =
+            upflexiramp_shortfall =
-            (instance.flexiramp_shortfall_penalty[t] >= 0) ?
+                (instance.flexiramp_shortfall_penalty[t] >= 0) ?
-            solution["Up-flexiramp shortfall (MW)"][t] : 0
+                solution["Up-flexiramp shortfall (MW)"][t] : 0
 
-        if upflexiramp + upflexiramp_shortfall < instance.reserves.upflexiramp[t] - tol
+            if upflexiramp + upflexiramp_shortfall < instance.reserves.upflexiramp[t] - tol
-            @error @sprintf(
+                @error @sprintf(
-                "Insufficient up-flexiramp at time %d (%.2f + %.2f should be %.2f)",
+                    "Insufficient up-flexiramp at time %d (%.2f + %.2f should be %.2f)",
-                t,
+                    t,
-                upflexiramp,
+                    upflexiramp,
-                upflexiramp_shortfall,
+                    upflexiramp_shortfall,
-                instance.reserves.upflexiramp[t],
+                    instance.reserves.upflexiramp[t],
-            )
+                )
-            err_count += 1
+                err_count += 1
-        end
+            end
         
-        dwflexiramp =
-            sum(solution["Down-flexiramp (MW)"][g.name][t] for g in instance.units)
-        dwflexiramp_shortfall =
-            (instance.flexiramp_shortfall_penalty[t] >= 0) ?
-            solution["Down-flexiramp shortfall (MW)"][t] : 0
 
-        if dwflexiramp + dwflexiramp_shortfall < instance.reserves.dwflexiramp[t] - tol
+            dwflexiramp =
-            @error @sprintf(
+                sum(solution["Down-flexiramp (MW)"][g.name][t] for g in instance.units)
-                "Insufficient down-flexiramp at time %d (%.2f + %.2f should be %.2f)",
+            dwflexiramp_shortfall =
-                t,
+                (instance.flexiramp_shortfall_penalty[t] >= 0) ?
-                dwflexiramp,
+                solution["Down-flexiramp shortfall (MW)"][t] : 0
-                dwflexiramp_shortfall,
+
-                instance.reserves.dwflexiramp[t],
+            if dwflexiramp + dwflexiramp_shortfall < instance.reserves.dwflexiramp[t] - tol
-            )
+                @error @sprintf(
-            err_count += 1
+                    "Insufficient down-flexiramp at time %d (%.2f + %.2f should be %.2f)",
-        end
+                    t,
-    # Verify spinning reserve solutions only if both up-flexiramp and  
+                    dwflexiramp,
-    # down-flexiramp requirements are arrays of zeros.
+                    dwflexiramp_shortfall,
-    else
+                    instance.reserves.dwflexiramp[t],
-        reserve =
+                )
-            sum(solution["Reserve (MW)"][g.name][t] for g in instance.units)
+                err_count += 1
-        reserve_shortfall =
+            end
-            (instance.shortfall_penalty[t] >= 0) ?
+        # Verify spinning reserve solutions only if both up-flexiramp and  
-            solution["Reserve shortfall (MW)"][t] : 0
+        # down-flexiramp requirements are arrays of zeros.
-
+        else
-        if reserve + reserve_shortfall < instance.reserves.spinning[t] - tol
+            reserve =
-            @error @sprintf(
+                sum(solution["Reserve (MW)"][g.name][t] for g in instance.units)
-                "Insufficient spinning reserves at time %d (%.2f + %.2f should be %.2f)",
+            reserve_shortfall =
-                t,
+                (instance.shortfall_penalty[t] >= 0) ?
-                reserve,
+                solution["Reserve shortfall (MW)"][t] : 0
-                reserve_shortfall,
+
-                instance.reserves.spinning[t],
+            if reserve + reserve_shortfall < instance.reserves.spinning[t] - tol
-            )
+                @error @sprintf(
-            err_count += 1
+                    "Insufficient spinning reserves at time %d (%.2f + %.2f should be %.2f)",
+                    t,
+                    reserve,
+                    reserve_shortfall,
+                    instance.reserves.spinning[t],
+                )
+                err_count += 1
+            end
         end
-    end
  
+    end
 
     return err_count
 end