From f6ed566aed25e19b25c4219d9095937b1556c0b9 Mon Sep 17 00:00:00 2001 From: "Chakrabarti, Sambuddha (Sam)" Date: Wed, 26 Apr 2023 22:15:24 -0400 Subject: [PATCH] Conflict resolution on main --- .../ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml | 2 +- .../Settings/highs_settings.yml | 1 - .../OneZone_MultiStage/Settings/highs_settings.yml | 1 - .../Simple_Test_Case/Settings/highs_settings.yml | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml b/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml index ae12ebc0bb..1df2f87f60 100644 --- a/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml +++ b/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml @@ -10,4 +10,4 @@ Method: ipm #HiGHS-specific solver settings # Solver option: "simple # Run the crossover routine for IPX # [type: bool, advanced: true, range: {false, true}, default: true] -run_crossover: off \ No newline at end of file +run_crossover: off diff --git a/Example_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml b/Example_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml index 8461b4caa6..1113ef7cbc 100644 --- a/Example_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml +++ b/Example_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml @@ -11,4 +11,3 @@ Method: ipm #HiGHS-specific solver settings # Solver option: "simplex # Run the crossover routine for IPX # [type: bool, advanced: true, range: {false, true}, default: true] run_crossover: off - diff --git a/Example_Systems/SmallNewEngland/OneZone_MultiStage/Settings/highs_settings.yml b/Example_Systems/SmallNewEngland/OneZone_MultiStage/Settings/highs_settings.yml index 314c5a0e1e..1df2f87f60 100644 --- a/Example_Systems/SmallNewEngland/OneZone_MultiStage/Settings/highs_settings.yml +++ b/Example_Systems/SmallNewEngland/OneZone_MultiStage/Settings/highs_settings.yml @@ -11,4 +11,3 @@ Method: ipm #HiGHS-specific solver settings # Solver option: "simple # Run the crossover routine for IPX # [type: bool, advanced: true, range: {false, true}, default: true] run_crossover: off - diff --git a/Example_Systems/SmallNewEngland/Simple_Test_Case/Settings/highs_settings.yml b/Example_Systems/SmallNewEngland/Simple_Test_Case/Settings/highs_settings.yml index d224097683..39b33f378d 100644 --- a/Example_Systems/SmallNewEngland/Simple_Test_Case/Settings/highs_settings.yml +++ b/Example_Systems/SmallNewEngland/Simple_Test_Case/Settings/highs_settings.yml @@ -10,4 +10,4 @@ Method: choose #HiGHS-specific solver settings # Solver option: "sim # Run the crossover routine for IPX # [type: bool, advanced: true, range: {false, true}, default: true] -run_crossover: "off" +run_crossover: off