Merge pull request #21 from ESMS-Group-Public/jakekrell-patch-1

FoKL 3.2.4

Author: derek-slack

src/FoKL/FoKLRoutines.py

@@ -1621,8 +1621,8 @@ def to_pyomo(self, m=None, y=None, x=None, **kwargs):
                              "is expected to be as the resulting symbolic expressions are too infeasible to solve. Use "
                              "the 'to_pyomo' method with a FoKL model trained on the 'Bernoulli Polynomials' kernel.")
 
-        m.fokl_expr = pyo.Expression(m.fokl_scenarios)  # FoKL models (i.e., scenarios, draws)
-        symbolic_fokl(m)  # may be better to write as rule
+        if m is None:
+            m = pyo.ConcreteModel()
 
         m.fokl_scenarios = pyo.Set(initialize=range(current['draws']))  # index for scenario (i.e., FoKL draw)
         m.fokl_y = pyo.Var(m.fokl_scenarios, within=pyo.Reals)  # FoKL output