updating examples and run files

Author: msdogan

concrete_model/calvin/calvin.py

@@ -202,10 +202,10 @@ def remove_debug_links(self):
     :returns: dataframe of links, excluding debug links.
     """
     df = self.df
-    ix = df.index[df.index.str.contains('DBUG')]
-    df.drop(ix, inplace=True, axis=0)
-    self.nodes = pd.unique(df[['i','j']].values.ravel()).tolist()
-    self.links = list(zip(df.i,df.j,df.k))
+    # ix = df.index[df.index.str.contains('DBUG')]
+    # df.drop(ix, inplace=True, axis=0)
+    # self.nodes = pd.unique(df[['i','j']].values.ravel()).tolist()
+    # self.links = list(zip(df.i,df.j,df.k))
     return df
 
 
@@ -225,10 +225,11 @@ def create_pyomo_model(self, debug_mode=False, debug_cost=2e7):
     if not debug_mode and self.df.index.str.contains('DBUG').any():
       # previously ran in debug mode, but now done
       df = self.remove_debug_links()
-      df.to_csv(self.linksfile + '-final.csv')
     else:
       df = self.df
 
+    df.to_csv(self.linksfile + '-final.csv')
+
     self.log.info('Creating Pyomo Model (debug=%s)' % debug_mode)
 
     model = ConcreteModel()
@@ -303,7 +304,7 @@ def flow_rule(model, node):
     self.model = model
 
 
-  def solve_pyomo_model(self, solver='glpk', nproc=1, debug_mode=False, maxiter=10):
+  def solve_pyomo_model(self, solver='glpk', nproc=1, debug_mode=False, maxiter=10, tee=False, save_json=False):
     """
     Solve Pyomo model (must be called after create_pyomo_model)
     
@@ -343,11 +344,15 @@ def solve_pyomo_model(self, solver='glpk', nproc=1, debug_mode=False, maxiter=10
 
     else:
       self.log.info('-----Solving Pyomo Model (debug=%s)' % debug_mode)
-      self.results = opt.solve(self.model, tee=False)
+      self.results = opt.solve(self.model, tee=tee)
 
       if self.results.solver.termination_condition == TerminationCondition.optimal:
         self.log.info('Optimal Solution Found (debug=%s).' % debug_mode)
-        self.model.solutions.load_from(self.results)
+        # save raw results to stdout
+        if save_json:
+            self.model.solutions.store_to(self.results)
+            self.results.write(filename='results.json', format='json')
+        # self.model.solutions.load_from(self.results)
       else:
         raise RuntimeError('Problem Infeasible. Run again starting from debug mode.')
 

concrete_model/calvin/plot.png

@@ -4,10 +4,10 @@
 calvin = CALVIN('links_example1.csv')
 
 # create pyomo model from specified data file
-calvin.create_pyomo_model(debug_mode=True)
+calvin.create_pyomo_model()
 
 # solve the problem
-calvin.solve_pyomo_model(solver='glpk', nproc=1, debug_mode=True)
+calvin.solve_pyomo_model(solver='glpk', nproc=1, tee=True)
 
 # postprocess results to create time-series files
-postprocess(calvin.df, calvin.model, resultdir='results3')
+postprocess(calvin.df, calvin.model, resultdir='results')