Relative capacity limits based on multiple projects (#1048)

db/csvs_test_examples/csv_structure.csv

@@ -19,6 +19,7 @@ project/project_new_binary_build_size,data_dependent,project_new_binary_build_si
 project/project_capacity_groups/requirements,data_dependent,project_capacity_group_requirement_scenario_id,project_capacity_group_requirements,simple,,0,0,,,,
 project/project_capacity_groups/projects,data_dependent,project_capacity_group_scenario_id,project_capacity_groups,simple,,0,0,,,,
 project/relative_capacity,data_dependent,project_relative_capacity_requirement_scenario_id,project_relative_capacity_requirements,simple,,0,0,,,,
+project/relative_capacity/mappings,data_dependent,prj_for_lim_map_id,project_relative_capacity_requirements_map,simple,,1,0,,,inputs_project_relative_capacity_requirements,project_relative_capacity_requirement_scenario_id
 project/project_fuels,data_dependent,project_fuel_scenario_id,project_fuels,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/project_heat_rate_curves,data_dependent,heat_rate_curves_scenario_id,project_heat_rate_curves,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/project_variable_om_curves,data_dependent,variable_om_curves_scenario_id,project_variable_om_curves,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id

db/csvs_test_examples/project/relative_capacity/1_base_rel_cap.csv

@@ -1,2 +1,2 @@
-project,project_for_limits,period,min_relative_capacity_limit_new,max_relative_capacity_limit_new,min_relative_capacity_limit_total,max_relative_capacity_limit_total
-Solar,Wind,2020,,,,2
+project,period,prj_for_lim_map_id,min_relative_capacity_limit_new,max_relative_capacity_limit_new,min_relative_capacity_limit_total,max_relative_capacity_limit_total
+Solar,2020,1,,,,2

db/csvs_test_examples/project/relative_capacity/mappings/Solar-1-base_map.csv

@@ -0,0 +1,2 @@
+project_for_limits
+Wind

db/db_schema.sql

@@ -1163,19 +1163,37 @@ CREATE TABLE inputs_project_relative_capacity_requirements
 (
     project_relative_capacity_requirement_scenario_id INTEGER,
     project                                           VARCHAR(64),
-    project_for_limits                                VARCHAR(64),
     period                                            INTEGER,
+    prj_for_lim_map_id                                INTEGER,
     min_relative_capacity_limit_new                   FLOAT,
     max_relative_capacity_limit_new                   FLOAT,
     min_relative_capacity_limit_total                 FLOAT,
     max_relative_capacity_limit_total                 FLOAT,
     PRIMARY KEY (project_relative_capacity_requirement_scenario_id, project,
-                 project_for_limits, period),
+                 period, prj_for_lim_map_id),
     FOREIGN KEY (project_relative_capacity_requirement_scenario_id) REFERENCES
         subscenarios_project_relative_capacity_requirements
             (project_relative_capacity_requirement_scenario_id)
 );
 
+DROP TABLE IF EXISTS subscenarios_project_relative_capacity_requirements_map;
+CREATE TABLE subscenarios_project_relative_capacity_requirements_map
+(
+    project            VARCHAR(64),
+    prj_for_lim_map_id INTEGER PRIMARY KEY AUTOINCREMENT,
+    name               VARCHAR(32),
+    description        VARCHAR(128)
+);
+
+DROP TABLE IF EXISTS inputs_project_relative_capacity_requirements_map;
+CREATE TABLE inputs_project_relative_capacity_requirements_map
+(
+    project            VARCHAR(64),
+    prj_for_lim_map_id INTEGER,
+    project_for_limits VARCHAR(64),
+    PRIMARY KEY (project, prj_for_lim_map_id, project_for_limits)
+);
+
 
 -- Group project mapping
 DROP TABLE IF EXISTS subscenarios_project_capacity_groups;

examples/test_new_solar_w_relative_capacity_instead_of_potential/inputs/project_relative_capacity_requirements.tab

@@ -1,2 +1,2 @@
-project	project_for_limits	period	min_relative_capacity_limit_new	max_relative_capacity_limit_new	min_relative_capacity_limit_total	max_relative_capacity_limit_total
-Solar	Wind	2020	.	.	.	2.0
+project	period	min_relative_capacity_limit_new	max_relative_capacity_limit_new	min_relative_capacity_limit_total	max_relative_capacity_limit_total
+Solar	2020	.	.	.	2.0

examples/test_new_solar_w_relative_capacity_instead_of_potential/inputs/project_relative_capacity_requirements_map.tab

@@ -0,0 +1,2 @@
+project	period	project_for_limit
+Solar	2020	Wind

tests/project/capacity/test_relative_capacity.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2020 Blue Marble Analytics LLC.
+# Copyright 2016-2023 Blue Marble Analytics LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -95,86 +95,85 @@ def test_initialized_components(self):
         )
         instance = m.create_instance(data)
 
-        # Set: RELATIVE_CAPACITY_PROJECT_PAIR_PERIODS
-        expected_prj_prd = sorted(
-            [("Battery", "Wind", 2020), ("Battery", "Wind", 2030)]
-        )
+        # Set: REL_CAP_PRJ_PRD
+        expected_prj_prd = sorted([("Battery", 2020), ("Battery", 2030)])
         actual_prj_prd = sorted(
             [
-                (prj, prj_l, period)
+                (prj, period)
                 for (
                     prj,
-                    prj_l,
                     period,
-                ) in instance.RELATIVE_CAPACITY_PROJECT_PAIR_PERIODS
+                ) in instance.REL_CAP_PRJ_PRD
             ]
         )
         self.assertListEqual(expected_prj_prd, actual_prj_prd)
 
+        # Set: PRJS_FOR_REL_CAP_LIMIT
+        expected_prj_prd = {
+            ("Battery", 2020): ["Wind"],
+            ("Battery", 2030): ["Wind", "Battery_Binary"],
+        }
+        actual_prj_prd = {
+            (prj, period): [prj for prj in instance.PRJS_FOR_REL_CAP_LIMIT[prj, period]]
+            for (
+                prj,
+                period,
+            ) in instance.REL_CAP_PRJ_PRD
+        }
+        self.assertDictEqual(expected_prj_prd, actual_prj_prd)
+
         # Params: min_relative_capacity_limit_new
         expected_new_min = {
-            ("Battery", "Wind", 2020): 0,
-            ("Battery", "Wind", 2030): 1,
+            ("Battery", 2020): 0,
+            ("Battery", 2030): 1,
         }
         actual_new_min = {
-            (prj, prj_for_lim, prd): instance.min_relative_capacity_limit_new[
-                prj, prj_for_lim, prd
-            ]
+            (prj, prd): instance.min_relative_capacity_limit_new[prj, prd]
             for (
                 prj,
-                prj_for_lim,
                 prd,
-            ) in instance.RELATIVE_CAPACITY_PROJECT_PAIR_PERIODS
+            ) in instance.REL_CAP_PRJ_PRD
         }
         self.assertDictEqual(expected_new_min, actual_new_min)
 
         # # Params: max_relative_capacity_limit_new
         expected_new_max = {
-            ("Battery", "Wind", 2020): 2,
-            ("Battery", "Wind", 2030): float("inf"),
+            ("Battery", 2020): 2,
+            ("Battery", 2030): float("inf"),
         }
         actual_new_max = {
-            (prj, prj_for_lim, prd): instance.max_relative_capacity_limit_new[
-                prj, prj_for_lim, prd
-            ]
+            (prj, prd): instance.max_relative_capacity_limit_new[prj, prd]
             for (
                 prj,
-                prj_for_lim,
                 prd,
-            ) in instance.RELATIVE_CAPACITY_PROJECT_PAIR_PERIODS
+            ) in instance.REL_CAP_PRJ_PRD
         }
         self.assertDictEqual(expected_new_max, actual_new_max)
 
         # Params: min_relative_capacity_limit_total
         expected_total_min = {
-            ("Battery", "Wind", 2020): 3,
-            ("Battery", "Wind", 2030): 0,
+            ("Battery", 2020): 3,
+            ("Battery", 2030): 0,
         }
         actual_total_min = {
-            (prj, prj_for_lim, prd): instance.min_relative_capacity_limit_total[
-                prj, prj_for_lim, prd
-            ]
+            (prj, prd): instance.min_relative_capacity_limit_total[prj, prd]
             for (
                 prj,
-                prj_for_lim,
                 prd,
-            ) in instance.RELATIVE_CAPACITY_PROJECT_PAIR_PERIODS
+            ) in instance.REL_CAP_PRJ_PRD
         }
         self.assertDictEqual(expected_total_min, actual_total_min)
 
         # Params: max_relative_capacity_limit_total
         expected_total_max = {
-            ("Battery", "Wind", 2020): float("inf"),
-            ("Battery", "Wind", 2030): 4,
+            ("Battery", 2020): float("inf"),
+            ("Battery", 2030): 4,
         }
         actual_total_max = {
-            (prj, prj_for_lim, prd): instance.max_relative_capacity_limit_total[
-                prj, prj_for_lim, prd
-            ]
+            (prj, prd): instance.max_relative_capacity_limit_total[prj, prd]
             for (
                 prj,
-                prj_for_lim,
                 prd,
-            ) in instance.RELATIVE_CAPACITY_PROJECT_PAIR_PERIODS
+            ) in instance.REL_CAP_PRJ_PRD
         }
         self.assertDictEqual(expected_total_max, actual_total_max)

tests/test_data/inputs/project_relative_capacity_requirements.tab

@@ -1,3 +1,3 @@
-project	project_for_limits	period	min_relative_capacity_limit_new	max_relative_capacity_limit_new	min_relative_capacity_limit_total	max_relative_capacity_limit_total
-Battery	Wind	2020	.	2	3	.
-Battery	Wind	2030	1	.	.	4
+project	period	min_relative_capacity_limit_new	max_relative_capacity_limit_new	min_relative_capacity_limit_total	max_relative_capacity_limit_total
+Battery	2020	.	2	3	.
+Battery	2030	1	.	.	4

tests/test_data/inputs/project_relative_capacity_requirements_map.tab

@@ -0,0 +1,4 @@
+project	period	project_for_limit
+Battery	2020	Wind
+Battery	2030	Wind
+Battery	2030	Battery_Binary