Update grid integration

idaes/apps/grid_integration/bidder.py

@@ -1214,8 +1214,13 @@ def _assemble_bids(self, model, power_var_name, energy_price_param_name, hour):
 
         for t in time_index:
 
-            # make sure the orignal points in the bids
-            for power, marginal_cost in self.bidding_model_object.model_data.p_cost:
+            # always include pmin in the cost curve, but include the other points if required
+            if self.bidding_model_object.model_data.include_default_p_cost:
+                p_cost_add = self.bidding_model_object.model_data.p_cost
+            else:
+                p_cost_add = self.bidding_model_object.model_data.p_cost[0:1]
+
+            for power, marginal_cost in p_cost_add:
                 if round(power, 2) not in bids[t][gen]:
                     bids[t][gen][power] = marginal_cost
 

idaes/apps/grid_integration/model_data.py

@@ -196,6 +196,9 @@ class ThermalGeneratorModelData(GeneratorModelData):
     Adds run time, ramping, shutdown and startup information for thermal generators.
     Requires as initial status and power production.
     Bids are in ( MWh, $ ) pairs
+
+    if `include_default_p_cost` is True, then the `production_cost_bid_pairs` provided during init
+    will always be included in future production cost curves (see bidder.py:1221)
     """
 
     min_down_time = RealValueValidator(min_val=0)
@@ -223,6 +226,8 @@ def __init__(
         fixed_commitment=None,
         production_cost_bid_pairs=None,
         startup_cost_pairs=None,
+        include_default_p_cost=True,
+        **kwargs,
     ):
 
         super().__init__(
@@ -241,6 +246,7 @@ def __init__(
         self.startup_capacity = startup_capacity
         self.initial_status = initial_status
         self.initial_p_output = initial_p_output
+        self.include_default_p_cost = include_default_p_cost
 
         self.p_cost = self._assemble_default_cost_bids(production_cost_bid_pairs)
         self.startup_cost = self._assemble_default_startup_cost_bids(startup_cost_pairs)
@@ -290,7 +296,15 @@ def _assemble_default_cost_bids(self, production_cost_bid_pairs):
                 f"The first power output in the bid should be the Pmin {self.p_min}, but {production_cost_bid_pairs[0][0]} is provided."
             )
 
-        if production_cost_bid_pairs[-1][0] != self.p_max:
+        if len(production_cost_bid_pairs) < 2:
+            raise ValueError(
+                f"A valid production_cost_bid_pairs requires at least 2 points"
+            )
+
+        if (
+            self.include_default_p_cost
+            and production_cost_bid_pairs[-1][0] != self.p_max
+        ):
             raise ValueError(
                 f"The last power output in the bid should be the Pmax {self.p_max}, but {production_cost_bid_pairs[-1][0]} is provided."
             )

idaes/apps/grid_integration/tests/test_bidder.py

@@ -295,3 +295,67 @@ def test_compute_RT_bids(bidder_object):
     }
 
     pyo_unittest.assertStructuredAlmostEqual(first=expected_bids, second=bids)
+
+
+@pytest.fixture
+def bidder_object_pcost():
+
+    solver = pyo.SolverFactory("cbc")
+    forecaster = TestingForecaster(prediction=30)
+
+    # create a bidder model
+    testing_model_data.include_default_p_cost = False
+    bidding_model_object = TestingModel(model_data=testing_model_data)
+    bidder_object = Bidder(
+        bidding_model_object=bidding_model_object,
+        day_ahead_horizon=day_ahead_horizon,
+        real_time_horizon=real_time_horizon,
+        n_scenario=n_scenario,
+        solver=solver,
+        forecaster=forecaster,
+    )
+    return bidder_object
+
+
+@pytest.mark.component
+@pytest.mark.skipif(
+    not prescient_avail, reason="Prescient (optional dependency) not available"
+)
+def test_compute_RT_bids_pcost(bidder_object_pcost):
+    marginal_cost = bidder_object_pcost.bidding_model_object.marginal_cost
+    gen = bidder_object_pcost.generator
+    default_bids = bidder_object_pcost.bidding_model_object.model_data.p_cost
+    pmin = bidder_object_pcost.bidding_model_object.pmin
+    pmax = bidder_object_pcost.bidding_model_object.pmax
+    date = "2021-08-20"
+
+    # test bidding when price forecast lower than marginal cost
+    # expect default bids
+    realized_day_ahead_prices = [29] * bidder_object_pcost.real_time_horizon
+    realized_day_ahead_dispatches = [0] * bidder_object_pcost.real_time_horizon
+    shift = 1
+    fixed_forecast = marginal_cost - shift
+    bidder_object_pcost.forecaster.prediction = fixed_forecast
+    bids = bidder_object_pcost.compute_real_time_bids(
+        date=date,
+        hour=0,
+        realized_day_ahead_prices=realized_day_ahead_prices,
+        realized_day_ahead_dispatches=realized_day_ahead_dispatches,
+    )
+
+    expected_bids = {
+        t: {
+            gen: {
+                "p_min": pmin,
+                "p_max": pmin,
+                "p_min_agc": pmin,
+                "p_max_agc": pmin,
+                "startup_capacity": pmin,
+                "shutdown_capacity": pmin,
+                "p_cost": [(30, 0)],
+            }
+        }
+        for t in range(horizon)
+    }
+
+    pyo_unittest.assertStructuredAlmostEqual(first=expected_bids, second=bids)

idaes/apps/grid_integration/tests/test_model_data.py

@@ -195,7 +195,7 @@ def test_bid_missing_pmin(generator_params):
 
 @pytest.mark.unit
 def test_bid_missing_pmax(generator_params):
-    generator_params["production_cost_bid_pairs"].pop()
+    generator_params["production_cost_bid_pairs"] = [(30, 0), (45, 0)]
     with pytest.raises(
         ValueError, match=r"^(The last power output in the bid should be the Pmax)"
     ):
@@ -212,6 +212,16 @@ def test_invalid_start_up_bid(generator_params):
         ThermalGeneratorModelData(**generator_params)
 
 
+@pytest.mark.unit
+def test_invalid_pcost(generator_params):
+    generator_params["production_cost_bid_pairs"] = [(30, 0)]
+    with pytest.raises(
+        ValueError,
+        match=r"^(A valid production_cost_bid_pairs requires at least 2 points)",
+    ):
+        ThermalGeneratorModelData(**generator_params)
+
+
 @pytest.mark.unit
 def test_model_data_iterator(generator_data_object):
 
@@ -232,6 +242,7 @@ def test_model_data_iterator(generator_data_object):
         "generator_type",
         "initial_status",
         "initial_p_output",
+        "include_default_p_cost",
     ]
     iter_result = [name for name, value in generator_data_object]