Merge pull request #6 from AymericPCLegros/agnostic_gams

Agnostic gams

Author: DLWoodruff

Diff for: doc/src/images/agnostic_architecture.png

@@ -2,13 +2,20 @@
 import sys
 import gams
 import gamspy_base
+import examples.farmer.farmer_gams_gen_agnostic as farmer_gams_gen_agnostic
 
 this_dir = os.path.dirname(os.path.abspath(__file__))
 
 gamspy_base_dir = gamspy_base.__path__[0]
 
 ws = gams.GamsWorkspace(working_directory=this_dir, system_directory=gamspy_base_dir)
 
-model = ws.add_job_from_file("farmer_augmented.gms")
+original_file = "farmer_average.gms"
+nonants = "crop"
+farmer_gams_gen_agnostic.create_ph_model(original_file, nonants)
+
+model = ws.add_job_from_file("farmer_average_ph")
+#model = ws.add_job_from_file("farmer_average_completed")
+#model = ws.add_job_from_file("farmer_linear_augmented")
 
 model.run(output=sys.stdout)

Diff for: examples/farmer/GAMS/farmer_augmented.py

@@ -1,4 +1,4 @@
-$title The Farmer's Problem formulated for GAMS/DECIS (FARM,SEQ=199)
+$title The Farmer s Problem formulated for GAMS/DECIS (FARM,SEQ=199)
 
 $onText
 This model helps a farmer to decide how to allocate
@@ -80,8 +80,12 @@ req(cropr)..   yld(cropr) + y(cropr) - sum(sameas(cropx,cropr),w(cropx)) =g= min
 
 beets..        w('beets1') + w('beets2') =l= yld('sugarbeets');
 
+x.up(crop) = land;
 w.up('beets1') = maxbeets1;
+$onText
+__InsertPH__here_Model_defined_three_lines_later
+$offText
 
 Model simple / profitdef, landuse, req, beets, ylddef /;
 
-solve simple using lp maximizing profit;
+solve simple using lp maximizing profit;

Diff for: examples/farmer/GAMS/farmer_average.gms

@@ -9,6 +9,11 @@
 
 w = gams.GamsWorkspace(working_directory=this_dir, system_directory=gamspy_base_dir)
 
-model = w.add_job_from_file("farmer_average.gms")
+#model = w.add_job_from_file("farmer_average_ph.gms")
+#model = w.add_job_from_file("farmer_augmented.gms")
+#model = w.add_job_from_file("farmer_linear_augmented.gms")
+#model = w.add_job_from_file("farmer_average_ph_quadratic")
+model = w.add_job_from_file("farmer_average_ph_linearized")
+
 
 model.run(output=sys.stdout)

Diff for: examples/farmer/GAMS/farmer_average.py

@@ -1,12 +1,17 @@
 # This software is distributed under the 3-clause BSD License.
 # Started by dlw Aug 2023
 
-import farmer_gams_agnostic
+import farmer_gams_gen_agnostic2 as farmer_gams_agnostic
+#import farmer_gams_agnostic
 from mpisppy.spin_the_wheel import WheelSpinner
 import mpisppy.utils.cfg_vanilla as vanilla
 import mpisppy.utils.config as config
 import mpisppy.agnostic.agnostic as agnostic
 
+from mpisppy import MPI
+fullcomm = MPI.COMM_WORLD
+global_rank = fullcomm.Get_rank()
+
 def _farmer_parse_args():
     # create a config object and parse JUST FOR TESTING
     cfg = config.Config()
@@ -28,9 +33,25 @@ def _farmer_parse_args():
 
 
 if __name__ == "__main__":
+
     print("begin ad hoc main for agnostic.py")
 
     cfg = _farmer_parse_args()
+    ### Creating the new gms file with ph included in it
+    original_file = "GAMS/farmer_average.gms"
+    nonants_support_set_name = "crop"
+    nonant_variables_name = "x"
+    nonants_name_pairs = [(nonants_support_set_name, nonant_variables_name)]
+
+
+    if global_rank == 0:
+        # Code for rank 0 to execute the task
+        print("Global rank 0 is executing the task.")
+        farmer_gams_agnostic.create_ph_model(original_file, nonants_name_pairs)
+        print("Global rank 0 has completed the task.")
+
+    # Broadcast a signal from rank 0 to all other ranks indicating the task is complete
+    fullcomm.Barrier()
     Ag = agnostic.Agnostic(farmer_gams_agnostic, cfg)
 
     scenario_creator = Ag.scenario_creator