Skip to content

Commit

Permalink
trimming solution files
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelbynum committed May 23, 2019
1 parent 8145016 commit cbcf2eb
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 11 deletions.
1 change: 0 additions & 1 deletion egret/models/tests/test_copperplate_dispatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ def test_copperplate_dispatch_model(self, test_case, soln_case):
md, results = solve_copperplate_dispatch(md_dict, "ipopt", solver_tee=False, return_results=True)

self.assertTrue(results.solver.termination_condition == TerminationCondition.optimal)
print(md_soln.data['system']['total_cost'], md.data['system']['total_cost'])
comparison = math.isclose(md.data['system']['total_cost'], md_soln.data['system']['total_cost'], rel_tol=1e-4)
self.assertTrue(comparison)

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"elements": {"bus": {"1": {"matpower_bustype": "ref", "area": 1.0, "vm": 1.0, "va": 0.0, "base_kv": 240.0, "zone": 1.0, "v_min": 0.9, "v_max": 1.1, "pl": 1.1, "lmp": 33.0641025641}, "2": {"matpower_bustype": "PV", "area": 1.0, "vm": 1.0, "va": 0.0, "base_kv": 240.0, "zone": 1.0, "v_min": 0.9, "v_max": 1.1, "pl": 1.1, "lmp": 33.0641025641}, "3": {"matpower_bustype": "PV", "area": 1.0, "vm": 1.0, "va": 0.0, "base_kv": 240.0, "zone": 1.0, "v_min": 0.9, "v_max": 1.1, "pl": 0.95, "lmp": 33.0641025641}}, "load": {"load_1": {"in_service": true, "p_load": 11000.0, "q_load": 4000.0, "bus": "1"}, "load_2": {"in_service": true, "p_load": 11000.0, "q_load": 4000.0, "bus": "2"}, "load_3": {"in_service": true, "p_load": 9500.0, "q_load": 5000.0, "bus": "3"}}, "generator": {"1": {"bus": "1", "pg": 127.564102564, "qg": 0.0, "vg": 1.0, "mbase": 100.0, "in_service": true, "p_min": 0.0, "p_max": 200000.0, "q_min": -100000.0, "q_max": 100000.0, "generator_type": "thermal", "p_cost": {"data_type": "cost_curve", "cost_curve_type": "polynomial", "values": {"0": 0.0, "1": 0.05, "2": 1.1000000000000001e-05}}, "startup_cost": 0.0, "shutdown_cost": 0.0}, "2": {"bus": "2", "pg": 187.435897436, "qg": 0.0, "vg": 1.0, "mbase": 100.0, "in_service": true, "p_min": 0.0, "p_max": 200000.0, "q_min": -100000.0, "q_max": 100000.0, "generator_type": "thermal", "p_cost": {"data_type": "cost_curve", "cost_curve_type": "polynomial", "values": {"0": 0.0, "1": 0.012, "2": 8.500000000000002e-06}}, "startup_cost": 0.0, "shutdown_cost": 0.0}, "3": {"bus": "3", "pg": 0.0, "qg": 0.0, "vg": 1.0, "mbase": 100.0, "in_service": true, "p_min": 0.0, "p_max": 0.0, "q_min": -100000.0, "q_max": 100000.0, "generator_type": "thermal", "p_cost": {"data_type": "cost_curve", "cost_curve_type": "polynomial", "values": {"0": 0.0, "1": 0.0, "2": 0.0}}, "startup_cost": 0.0, "shutdown_cost": 0.0}}, "branch": {"1": {"from_bus": "1", "to_bus": "3", "resistance": 0.065, "reactance": 0.62, "charging_susceptance": 0.45, "branch_type": "line", "rating_long_term": 900000.0, "rating_short_term": 900000.0, "rating_emergency": 900000.0, "in_service": true, "angle_diff_min": -30.0, "angle_diff_max": 30.0, "pf": null, "qf": null, "pt": null, "qt": null}, "2": {"from_bus": "3", "to_bus": "2", "resistance": 0.025, "reactance": 0.75, "charging_susceptance": 0.7, "branch_type": "line", "rating_long_term": 5000.0, "rating_short_term": 5000.0, "rating_emergency": 5000.0, "in_service": true, "angle_diff_min": -30.0, "angle_diff_max": 30.0, "pf": null, "qf": null, "pt": null, "qt": null}, "3": {"from_bus": "1", "to_bus": "2", "resistance": 0.042, "reactance": 0.9, "charging_susceptance": 0.3, "branch_type": "line", "rating_long_term": 900000.0, "rating_short_term": 900000.0, "rating_emergency": 900000.0, "in_service": true, "angle_diff_min": -30.0, "angle_diff_max": 30.0, "pf": null, "qf": null, "pt": null, "qt": null}}}, "system": {"model_name": "pglib_opf_case3_lmbd", "mpc_version": "'2'", "baseMVA": 100.0, "reference_bus": "1", "reference_bus_angle": 0.0, "total_cost": 5638.967948717949}}
{"elements": {"bus": {"1": {"vm": 1.0, "va": 0.0}, "2": {"vm": 1.0, "va": 0.0}, "3": {"vm": 1.0, "va": 0.0}}, "load": {}, "generator": {"1": {"pg": 127.564102564, "qg": 0.0}, "2": {"pg": 187.435897436, "qg": 0.0}, "3": {"pg": 0.0, "qg": 0.0}}, "branch": {}, "shunt": {}}, "system": {"model_name": "pglib_opf_case3_lmbd", "mpc_version": "'2'", "baseMVA": 100.0, "reference_bus": "1", "reference_bus_angle": 0.0, "total_cost": 5638.967948717949}}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"elements": {"bus": {"1": {"matpower_bustype": "ref", "area": 1.0, "vm": 1.0, "va": 0.0, "base_kv": 240.0, "zone": 1.0, "v_min": 0.9, "v_max": 1.1, "lmp": 36.7533333335, "pl": 1.1}, "2": {"matpower_bustype": "PV", "area": 1.0, "vm": 1.0, "va": 0.0959999999952, "base_kv": 240.0, "zone": 1.0, "v_min": 0.9, "v_max": 1.1, "lmp": 30.213333333199998, "pl": 1.1}, "3": {"matpower_bustype": "PV", "area": 1.0, "vm": 1.0, "va": -0.279000000002, "base_kv": 240.0, "zone": 1.0, "v_min": 0.9, "v_max": 1.1, "lmp": 41.258666667099995, "pl": 0.95}}, "load": {"load_1": {"in_service": true, "p_load": 11000.0, "q_load": 4000.0, "bus": "1"}, "load_2": {"in_service": true, "p_load": 11000.0, "q_load": 4000.0, "bus": "2"}, "load_3": {"in_service": true, "p_load": 9500.0, "q_load": 5000.0, "bus": "3"}}, "generator": {"1": {"bus": "1", "pg": 144.333333334, "qg": 0.0, "vg": 1.0, "mbase": 100.0, "in_service": true, "p_min": 0.0, "p_max": 200000.0, "q_min": -100000.0, "q_max": 100000.0, "generator_type": "thermal", "p_cost": {"data_type": "cost_curve", "cost_curve_type": "polynomial", "values": {"0": 0.0, "1": 0.05, "2": 1.1000000000000001e-05}}, "startup_cost": 0.0, "shutdown_cost": 0.0}, "2": {"bus": "2", "pg": 170.666666666, "qg": 0.0, "vg": 1.0, "mbase": 100.0, "in_service": true, "p_min": 0.0, "p_max": 200000.0, "q_min": -100000.0, "q_max": 100000.0, "generator_type": "thermal", "p_cost": {"data_type": "cost_curve", "cost_curve_type": "polynomial", "values": {"0": 0.0, "1": 0.012, "2": 8.500000000000002e-06}}, "startup_cost": 0.0, "shutdown_cost": 0.0}, "3": {"bus": "3", "pg": 0.0, "qg": 0.0, "vg": 1.0, "mbase": 100.0, "in_service": true, "p_min": 0.0, "p_max": 0.0, "q_min": -100000.0, "q_max": 100000.0, "generator_type": "thermal", "p_cost": {"data_type": "cost_curve", "cost_curve_type": "polynomial", "values": {"0": 0.0, "1": 0.0, "2": 0.0}}, "startup_cost": 0.0, "shutdown_cost": 0.0}}, "branch": {"1": {"from_bus": "1", "to_bus": "3", "resistance": 0.065, "reactance": 0.62, "charging_susceptance": 0.45, "branch_type": "line", "rating_long_term": 900000.0, "rating_short_term": 900000.0, "rating_emergency": 900000.0, "in_service": true, "angle_diff_min": -30.0, "angle_diff_max": 30.0, "pf": 45.0000000004, "qf": null, "pt": null, "qt": null}, "2": {"from_bus": "3", "to_bus": "2", "resistance": 0.025, "reactance": 0.75, "charging_susceptance": 0.7, "branch_type": "line", "rating_long_term": 5000.0, "rating_short_term": 5000.0, "rating_emergency": 5000.0, "in_service": true, "angle_diff_min": -30.0, "angle_diff_max": 30.0, "pf": -49.9999999996, "qf": null, "pt": null, "qt": null}, "3": {"from_bus": "1", "to_bus": "2", "resistance": 0.042, "reactance": 0.9, "charging_susceptance": 0.3, "branch_type": "line", "rating_long_term": 900000.0, "rating_short_term": 900000.0, "rating_emergency": 900000.0, "in_service": true, "angle_diff_min": -30.0, "angle_diff_max": 30.0, "pf": -10.6666666661, "qf": null, "pt": null, "qt": null}}}, "system": {"model_name": "pglib_opf_case3_lmbd", "mpc_version": "'2'", "baseMVA": 100.0, "reference_bus": "1", "reference_bus_angle": 0.0, "total_cost": 5693.803333337693}}
{"elements": {"bus": {"1": {"vm": 1.0, "va": 0.0}, "2": {"vm": 1.0, "va": 0.0959999999952}, "3": {"vm": 1.0, "va": -0.279000000002}}, "load": {}, "generator": {"1": {"pg": 144.333333334, "qg": 0.0}, "2": {"pg": 170.666666666, "qg": 0.0}, "3": {"pg": 0.0, "qg": 0.0}}, "branch": {}, "shunt": {}}, "system": {"model_name": "pglib_opf_case3_lmbd", "mpc_version": "'2'", "baseMVA": 100.0, "reference_bus": "1", "reference_bus_angle": 0.0, "total_cost": 5693.803333337693}}

0 comments on commit cbcf2eb

Please sign in to comment.