add infrastructure for PDS1, PDS2, PDS3

Changes to solution extraction, solution factory, solution tests and documentation to generate, use and test the new PDS1, PDS2 and PDS3 fields .

solution/afforestation/tests/test_afforestation.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_afforestation_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_afforestation_results(scenario_skip=None, test_skip=None, test_only=None):

solution/airplanes/tests/test_airplanes.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_airplanes_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_airplanes_results(scenario_skip=None, test_skip=None, test_only=None):

solution/altcement/tests/test_altcement.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_altcement_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_altcement_results(scenario_skip=None, test_skip=None, test_only=None):

solution/bamboo/tests/test_bamboo.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_bamboo_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_bamboo_results(scenario_skip=None, test_skip=None, test_only=None):

solution/bikeinfrastructure/ac/PDS2-8p2050-Based_on_Several_Sources_Book_Ed1.json

@@ -143,7 +143,7 @@
         "EU": 0.0,
         "USA": 0.0
     },
-    "soln_pds_adoption_custom_name": "(OPT2) Drawdown Team projections based on a weighted average of Several Sources",
+    "soln_pds_adoption_custom_name": "(PDS2) Drawdown Team projections based on a weighted average of Several Sources",
     "soln_ref_adoption_basis": "Custom",
     "soln_ref_adoption_custom_name": "Drawdown Book Ed.1 Reference Scenario",
     "soln_ref_adoption_regional_data": false,

solution/bikeinfrastructure/changelog

@@ -0,0 +1,2 @@
+8/2021
+Fixed load failure that occurred because the Adoption had been renamed; corrected the name in the scenario.

solution/bikeinfrastructure/tests/test_bikeinfrastructure.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_bikeinfrastructure_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_bikeinfrastructure_results(scenario_skip=None, test_skip=None, test_only=None):

solution/biochar/tests/test_biochar.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_biochar_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_biochar_results(scenario_skip=None, test_skip=None, test_only=None):

solution/biogas/tests/test_biogas.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_biogas_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_biogas_results(scenario_skip=None, test_skip=None, test_only=None):

solution/biogas_small/tests/test_biogas_small.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_biogas_small_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_biogas_small_results(scenario_skip=None, test_skip=None, test_only=None):

solution/biomass/tests/test_biomass.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_biomass_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_biomass_results(scenario_skip=None, test_skip=None, test_only=None):

solution/bioplastic/tests/test_bioplastic.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_bioplastic_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_bioplastic_results(scenario_skip=None, test_skip=None, test_only=None):

solution/buildingautomation/tests/test_buildingautomation.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_buildingautomation_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_buildingautomation_results(scenario_skip=None, test_skip=None, test_only=None):

solution/carpooling/tests/test_carpooling.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_carpooling_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_carpooling_results(scenario_skip=None, test_skip=None, test_only=None):

solution/composting/tests/test_composting.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_composting_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_composting_results(scenario_skip=None, test_skip=None, test_only=None):

solution/concentratedsolar/tests/test_concentratedsolar.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_concentratedsolar_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_concentratedsolar_results(scenario_skip=None, test_skip=None, test_only=None):

solution/conservationagriculture/tests/test_conservationagriculture.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_conservationagriculture_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_conservationagriculture_results(scenario_skip=None, test_skip=None, test_only=None):

solution/coolroofs/tests/test_coolroofs.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_coolroofs_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_coolroofs_results(scenario_skip=None, test_skip=None, test_only=None):

solution/districtheating/tests/test_districtheating.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_districtheating_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_districtheating_results(scenario_skip=None, test_skip=None, test_only=None):

solution/electricbikes/tests/test_electricbikes.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_electricbikes_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_electricbikes_results(scenario_skip=None, test_skip=None, test_only=None):

solution/electricvehicles/__init__.py

@@ -128,9 +128,9 @@
 
 # These are the "default" scenarios to use for each of the drawdown categories.
 # They should be set to the most recent "official" set"
-PDS1 = "PDS1-3p2050_Based on Navigant, Bloomberg (Book Ed.1)"
-PDS2 = "PDS2-5p2050_Based on ITDP/UCD (Book Ed.1)"
-PDS3 = "PDS3-6p2050_Growth to 6.5% (Book Ed.1)"
+PDS1 = "PDS1-16p2050-with IEA 2DS (Integrated)"
+PDS2 = "PDS2-23p2050-using IEA B2DS (Integrated)"
+PDS3 = "PDS3-18p2050-Survival Analysis (Integrated)"
 
 class Scenario(scenario.Scenario):
     name = name

solution/electricvehicles/tests/test_electricvehicles.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_electricvehicles_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_electricvehicles_results(scenario_skip=None, test_skip=None, test_only=None):

solution/factory.py

@@ -22,8 +22,29 @@ def one_solution_scenarios(solution):
     return (m.Scenario, list(m.scenarios.keys()))
 
 
+def solution_pds_type(solution, pds_type):
+    """Return the standard scenario for solution of type pds_type, where pds_type is one of
+    'PDS1', 'PDS2', 'PDS3'"""
+    importname = 'solution.' + solution
+    m = importlib.import_module(importname)       
+    if pds_type == "PDS1":
+        return m.Scenario(m.PDS1)
+    if pds_type == "PDS2":
+        return m.Scenario(m.PDS2)
+    if pds_type == "PDS3":
+        return m.Scenario(m.PDS3)
+    raise ValueError("Scenario type not one of 'PDS1', 'PDS2' or 'PDS3'")
+
+
 def all_solutions_scenarios():
     everything = {}
     for solution in all_solutions():
         everything[solution] = one_solution_scenarios(solution)
     return everything
+
+
+def all_solutions_scenario_type(scenario_type):
+    everything = {}
+    for solution in all_solutions():
+        everything[solution] = solution_pds_type(scenario_type)
+    return everything

solution/farmlandrestoration/tests/test_farmlandrestoration.py

@@ -17,11 +17,11 @@
 TEST_SKIP = None
 
 def test_farmlandrestoration_loader():
-    """Test that the solution can load a single scenario"""
-    (constructor,scenarios) = factory.one_solution_scenarios(solution_name)
-    assert len(scenarios) > 0
-    ascenario = constructor(scenarios[0])
-    assert ascenario is not None
+    """Test that the solution can load the defined scenarios"""
+    pds1 = factory.solution_pds_type(solution_name,"PDS1")
+    pds2 = factory.solution_pds_type(solution_name,"PDS2")
+    pds3 = factory.solution_pds_type(solution_name, "PDS3")
+    assert pds1 and pds2 and pds3
 
 @pytest.mark.slow
 def test_farmlandrestoration_results(scenario_skip=None, test_skip=None, test_only=None):