diff --git a/gtep/driver.py b/gtep/driver.py index c50e7e9..8137df4 100644 --- a/gtep/driver.py +++ b/gtep/driver.py @@ -4,10 +4,9 @@ from pyomo.core import TransformationFactory from pyomo.contrib.appsi.solvers.highs import Highs from pyomo.contrib.appsi.solvers.gurobi import Gurobi +import gurobipy as gp - - -data_path = "./data/5bus" +data_path = "./gtep/data/5bus" data_object = ExpansionPlanningData() data_object.load_prescient(data_path) @@ -23,8 +22,8 @@ TransformationFactory("gdp.bound_pretransformation").apply_to(mod_object.model) TransformationFactory("gdp.bigm").apply_to(mod_object.model) # opt = SolverFactory("gurobi") -opt = Gurobi() -# opt = Highs() +# opt = Gurobi() +opt = Highs() # # mod_object.results = opt.solve(mod_object.model, tee=True) mod_object.results = opt.solve(mod_object.model) diff --git a/gtep/tests/unit/test_validation.py b/gtep/tests/unit/test_validation.py new file mode 100644 index 0000000..cd469c2 --- /dev/null +++ b/gtep/tests/unit/test_validation.py @@ -0,0 +1,20 @@ +import pyomo.common.unittest as unittest +from gtep.gtep_model import ExpansionPlanningModel +from gtep.gtep_data import ExpansionPlanningData +from gtep.gtep_solution import ExpansionPlanningSolution +import logging + +input_data_source = "./gtep/data/5bus" + +class TestValidation(unittest.TestCase): + def test_populate_generators(self): + pass + + def test_populate_transmission(self): + pass + + def test_filter_pointers(self): + pass + + def test_clone_timeseries(self): + pass \ No newline at end of file diff --git a/gtep/validation.py b/gtep/validation.py new file mode 100644 index 0000000..6f13ee3 --- /dev/null +++ b/gtep/validation.py @@ -0,0 +1,19 @@ +from pyomo.environ import * +from gtep.gtep_model import ExpansionPlanningModel +import logging + +import pandas as pd + +logger = logging.getLogger(__name__) + +def populate_generators(data_input_path, sol_object, data_output_path): + pass + +def populate_transmission(data_input_path, sol_object, data_output_path): + pass + +def filter_pointers(data_input_path, sol_object, data_output_path): + pass + +def clone_timeseries(data_input_path, sol_object, data_output_path): + pass \ No newline at end of file