update data (net imports), appliance names, figures

NTNU-IndEcol · Aug 30, 2024 · 42391ff · 42391ff
1 parent be38009
commit 42391ff
Show file tree

Hide file tree

Showing 6 changed files with 403 additions and 287 deletions.
diff --git a/1_preprocessing.ipynb b/1_preprocessing.ipynb
@@ -51,7 +51,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "durables = ['fridge & fridge freezer' ,'freezer','washing machine', 'tumble dryer', 'dishwasher', 'oven']\n",
+    "durables = ['fridges' ,'freezers','washing machines', 'tumble dryers', 'dishwashers', 'ovens']\n",
     "TimeStart = 1940\n",
     "TimeEnd = 2022\n",
     "MyYears = list(range(TimeStart,TimeEnd+1))\n",

diff --git a/2_preliminary_analysis_global.ipynb b/2_preliminary_analysis_global.ipynb
@@ -262,7 +262,7 @@
     "ModelClassification_app['Element'] = msc.Classification(Name= 'Elements', Dimension = 'Element', ID = 3, \n",
     "                                                    Items = ['C'])\n",
     "ModelClassification_app['Durable'] = msc.Classification(Name = 'Durable', Dimension = 'Durable', ID = 4, \n",
-    "                                                    Items = ['fridge & fridge freezer' ,'freezer','washing machine', 'tumble dryer', 'dishwasher', 'oven'])\n",
+    "                                                    Items = ['fridges' ,'freezers','washing machines', 'tumble dryers', 'dishwashers', 'ovens'])\n",
     "ModelClassification_app['Run'] = msc.Classification(Name = 'Model run', Dimension = 'Run', ID = 5, \n",
     "                                                    Items = [])\n",
     "aspects = ['Time','Element','Cohort', 'Durable', 'Run']\n",

diff --git a/3a_analysis_constant.ipynb b/3a_analysis_constant.ipynb
@@ -225,7 +225,7 @@
     "ModelClassification_app['Element'] = msc.Classification(Name= 'Elements', Dimension = 'Element', ID = 3, \n",
     "                                                    Items = ['C'])\n",
     "ModelClassification_app['Durable'] = msc.Classification(Name = 'Durable', Dimension = 'Durable', ID = 4, \n",
-    "                                                    Items = ['fridge & fridge freezer' ,'freezer','washing machine', 'tumble dryer', 'dishwasher', 'oven'])\n",
+    "                                                    Items = ['fridges' ,'freezers','washing machines', 'tumble dryers', 'dishwashers', 'ovens'])\n",
     "ModelClassification_app['Run'] = msc.Classification(Name = 'Model run', Dimension = 'Run', ID = 5, \n",
     "                                                    Items = [])\n",
     "aspects = ['Time','Element','Cohort', 'Durable', 'Run']\n",
@@ -296,7 +296,7 @@
     "i_seg = {}\n",
     "for d,durable in enumerate(ModelClassification_app['Durable'].Items):\n",
     "    y = Dyn_MFA_System.ParameterDict['I'].Values[:,d]\n",
-    "    if durable in ['dishwasher', 'tumble dryer', 'freezer']:\n",
+    "    if durable in ['dishwashers', 'tumble dryers', 'freezers']:\n",
     "        segs = [1970,1980,1990,2000,2010]\n",
     "    else:\n",
     "        segs = [1960,1970,1980,1990,2000,2010]\n",

diff --git a/3b_analysis_logistic.ipynb → 3b_analysis_variable.ipynb b/3b_analysis_logistic.ipynb → 3b_analysis_variable.ipynb
@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Notebook 3b - final analysis, logistic lifetime"
+    "# Notebook 3b - final analysis, variable lifetime"
    ]
   },
   {
@@ -232,7 +232,7 @@
     "ModelClassification_app['Element'] = msc.Classification(Name= 'Elements', Dimension = 'Element', ID = 3, \n",
     "                                                    Items = ['C'])\n",
     "ModelClassification_app['Durable'] = msc.Classification(Name = 'Durable', Dimension = 'Durable', ID = 4, \n",
-    "                                                    Items = ['fridge & fridge freezer' ,'freezer','washing machine', 'tumble dryer', 'dishwasher', 'oven'])\n",
+    "                                                    Items = ['fridges' ,'freezers','washing machines', 'tumble dryers', 'dishwashers', 'ovens'])\n",
     "ModelClassification_app['Run'] = msc.Classification(Name = 'Model run', Dimension = 'Run', ID = 5, \n",
     "                                                    Items = [])\n",
     "aspects = ['Time','Element','Cohort', 'Durable', 'Run']\n",
@@ -253,7 +253,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "Dyn_MFA_System = msc.MFAsystem(Name = 'ApplianceSystem_logisticLT', \n",
+    "Dyn_MFA_System = msc.MFAsystem(Name = 'ApplianceSystem_variableLT', \n",
     "                      Geogr_Scope = 'Norway', \n",
     "                      Unit = '1', \n",
     "                      ProcessList = [], \n",
@@ -303,7 +303,7 @@
     "i_seg = {}\n",
     "for d,durable in enumerate(ModelClassification_app['Durable'].Items):\n",
     "    y = Dyn_MFA_System.ParameterDict['I'].Values[:,d]\n",
-    "    if durable in ['dishwasher', 'tumble dryer', 'freezer']:\n",
+    "    if durable in ['dishwashers', 'tumble dryers', 'freezers']:\n",
     "        segs = [1970,1980,1990,2000,2010]\n",
     "    else:\n",
     "        segs = [1960,1970,1980,1990,2000,2010]\n",
@@ -484,7 +484,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "with open(\"3b_analysis_logistic.dat\", \"wb\") as f:\n",
+    "with open(\"3b_analysis_variable.dat\", \"wb\") as f:\n",
     "    pickle.dump([Dyn_MFA_System, problem, param_values, no_of_runs], f)"
    ]
   },