Pyomo TCLab v6: optimization proof of concept

.gitignore

@@ -1 +1,8 @@
 src/FoKL/__pycache__/
+.idea/.gitignore
+.idea/misc.xml
+.idea/modules.xml
+.idea/tclab.iml
+.idea/vcs.xml
+.idea/inspectionProfiles/profiles_settings.xml
+.idea/inspectionProfiles/Project_Default.xml

docs/_dev/fokl_to_pyomo__.20240723.md

@@ -0,0 +1,62 @@
+```python
+fokl_to_pyomo(self, xvars, yvar, m=None, t=None, scenarios=None)
+```
+
+---
+
+```python
+s = scenarios
+
+if t is None and s is None:
+    ts = None
+else:  
+    if t is None:
+        ts = s
+    elif s is None:
+        ts = t
+    else:
+        ts = [t, s]
+```
+
+---
+
+If   ```xvars``` or ```yvar``` are strings,
+
+```python
+for j in len(xvars):
+    if isinstance(xvars[j], str):
+        xvars[j] = pyo.Var(ts, bounds=self.minmax[j])
+
+if isinstance(yvar, str):
+    yvar = pyo.Var(ts)
+```
+
+---
+
+If ```s```,
+
+- ```m.GPi[(t), s]   # == pyo.Constraint(yvar == m.GPi_y)```
+- ```m.GPi_y[(t), s]```
+- ```m.GPi_beta[s, term]```
+    - assume the most recent GP draws are the Pyomo scenarios; that is, ```= self.betas[-(s + 1), term]```.
+
+Else,
+
+- ```m.GPi[(t)]   # == pyo.Constraint(yvar == m.GPi_y)```
+- ```m.GPi_y[(t)]```
+- ```m.GPi_beta[term]```
+    - assume the average of the GP draws are the single Pyomo scenario; that is, ```= np.mean(self.betas, axis=0)[term]```.
+
+Note ```xvars``` and ```yvar``` are not required to be indexed by ```s```.
+
+---
+
+If ```t```,
+
+- ```m.GPi[t, (s)]  # == pyo.Constraint(yvar == m.GPi_y)```
+- ```m.GPi_y[t, (s)]```
+
+Note at least one variable in ```[xvars, yvar]``` must be indexed by ```t```.
+
+
+

examples/pyomo_multiple_models/pyomo_multiple_models.py

@@ -10,7 +10,7 @@
 Then, T will be found to maximize abs(G).
 """
 from FoKL import FoKLRoutines
-from FoKL.fokl_to_pyomo import fokl_to_pyomo
+from FoKL.fokl_to_pyomo__old import fokl_to_pyomo
 import os
 dir = os.path.abspath(os.path.dirname(__file__))  # directory of script
 # # -----------------------------------------------------------------------