This PR updates the models to account for the current logical expression system in pyomo, as well as the fact that GDPopt now requires that an algorithm be specified. In addition, some models were not importable either because of dashes in the filename, because of relative imports, or because of hard-coded data files. This updates those so that they can be instantiated and run outside of the gdplib directory. Last, this updates the use of indicator_var to comply with the fact that it is now Boolean, and adds the use of binary_indicator_var when it is the binary that is needed.
This PR updates the models to account for the current logical expression system in pyomo, as well as the fact that GDPopt now requires that an algorithm be specified. In addition, some models were not importable either because of dashes in the filename, because of relative imports, or because of hard-coded data files. This updates those so that they can be instantiated and run outside of the gdplib directory. Last, this updates the use of
indicator_var
to comply with the fact that it is now Boolean, and adds the use ofbinary_indicator_var
when it is the binary that is needed.