Merge branch 'develop'

CHANGELOG.rst

@@ -2,6 +2,15 @@
 Changelog
 #########
 
+**********************
+v0.3.4 (Jan 12, 2018)
+**********************
+
+API breaking changes  
+=====================
+
+- Footprints and territorial accounts were renamed to "consumption based accounts" and "production based accounts": D_fp was renamed to D_cba and D_terr to D_pba 
+
 **********************
 v0.3.3 (Jan 11, 2018)
 **********************

doc/source/api_references.rst

@@ -86,7 +86,7 @@ fact yield) several tables at once:
    IOSystem.get_DataFrame
    IOSystem.get_extensions
 
-For the extensions, it is also possible to receive all data (F, S, M, D_fp, ...) 
+For the extensions, it is also possible to receive all data (F, S, M, D_cba, ...) 
 for one specified row. 
 
 .. autosummary::

doc/source/math.rst

@@ -116,12 +116,12 @@ If the factor of production represent required environmental impacts, these can
 also occur during the final use phase. In that case :math:`G` describe the impacts
 associated with final demand.
 
-Direct territorial requirements per country are than given by: 
+The production based accounts (direct territorial requirements) per country are than given by: 
 
 .. math::
 
     \begin{equation}
-        D_{terr} = Fe + Ge
+        D_{pba} = Fe + Ge
     \end{equation}
 
 Multipliers for :math:`F` are obtained by
@@ -138,7 +138,7 @@ given final demand vector :math:`y` are than given by
 .. math::
 
     \begin{equation}
-        D_{fp} = My
+        D_{cba} = My
     \end{equation}
 
 Setting the domestically satisfied final demand :math:`Y_{i,i}` to zero (:math:`Y_{t} = Y -
@@ -161,14 +161,14 @@ other countries is given by:
     \end{equation}
 
 The total requirement for each country can be obtained by summing over the
-sectors for each account (:math:`D_{fp}`, :math:`D_{imp}` and :math:`D_{exp}`).  In case of
-:math:`D_{fp}` any impacts associated with the use (:math:`G`) must be added.  Using that
+sectors for each account (:math:`D_{cba}`, :math:`D_{imp}` and :math:`D_{exp}`).  In case of
+:math:`D_{cba}` any impacts associated with the use (:math:`G`) must be added.  Using that
 approach, footprints for each country :math:`i` satisfy:
 
 .. math::
 
     \begin{equation}
-        D_{fp}^i = D_{terr}^i + D_{imp}^i  - D_{exp}^i
+        D_{cba}^i = D_{pba}^i + D_{imp}^i  - D_{exp}^i
     \end{equation}
 
 Aggregation

doc/source/notebooks/aggregation_examples.ipynb

@@ -61,7 +61,7 @@
     {
      "data": {
       "text/plain": [
-       "<pymrio.core.mriosystem.IOSystem at 0x7fc7bed464e0>"
+       "<pymrio.core.mriosystem.IOSystem at 0x7fba581e2a20>"
       ]
      },
      "execution_count": 2,
@@ -135,7 +135,7 @@
     {
      "data": {
       "text/plain": [
-       "<pymrio.core.mriosystem.IOSystem at 0x7fc7bed464e0>"
+       "<pymrio.core.mriosystem.IOSystem at 0x7fba581e2a20>"
       ]
      },
      "execution_count": 5,
@@ -173,7 +173,7 @@
     {
      "data": {
       "text/plain": [
-       "<pymrio.core.mriosystem.IOSystem at 0x7fc7bed464e0>"
+       "<pymrio.core.mriosystem.IOSystem at 0x7fba581e2a20>"
       ]
      },
      "execution_count": 7,
@@ -285,7 +285,7 @@
     }
    ],
    "source": [
-    "io.emissions.D_fp"
+    "io.emissions.D_cba"
    ]
   },
   {
@@ -462,7 +462,7 @@
     }
    ],
    "source": [
-    "io_vec_agg.emissions.D_fp_reg"
+    "io_vec_agg.emissions.D_cba_reg"
    ]
   },
   {
@@ -532,7 +532,7 @@
     {
      "data": {
       "text/plain": [
-       "<pymrio.core.mriosystem.IOSystem at 0x7fc7b41bcc18>"
+       "<pymrio.core.mriosystem.IOSystem at 0x7fba500bb518>"
       ]
      },
      "execution_count": 18,
@@ -637,7 +637,7 @@
     }
    ],
    "source": [
-    "io.emissions.D_fp_reg"
+    "io.emissions.D_cba_reg"
    ]
   },
   {
@@ -736,7 +736,7 @@
     {
      "data": {
       "text/plain": [
-       "<pymrio.core.mriosystem.IOSystem at 0x7fc79e55cd30>"
+       "<pymrio.core.mriosystem.IOSystem at 0x7fba395005f8>"
       ]
      },
      "execution_count": 24,
@@ -875,7 +875,7 @@
     }
    ],
    "source": [
-    "wiod_agg_DEU_EU_OECD.AIR.D_fp_reg"
+    "wiod_agg_DEU_EU_OECD.AIR.D_cba_reg"
    ]
   },
   {
@@ -972,7 +972,7 @@
     }
    ],
    "source": [
-    "pymrio.load_test().calc_all().aggregate(region_agg='global', sector_agg='total').emissions.D_fp"
+    "pymrio.load_test().calc_all().aggregate(region_agg='global', sector_agg='total').emissions.D_cba"
    ]
   },
   {
@@ -1105,7 +1105,7 @@
     }
    ],
    "source": [
-    "io_pre.emissions.D_fp"
+    "io_pre.emissions.D_cba"
    ]
   },
   {
@@ -1208,7 +1208,7 @@
     }
    ],
    "source": [
-    "io_post.emissions.D_fp"
+    "io_post.emissions.D_cba"
    ]
   },
   {
@@ -1320,7 +1320,7 @@
     }
    ],
    "source": [
-    "io_post.reset_all_full().calc_all().emissions.D_fp"
+    "io_post.reset_all_full().calc_all().emissions.D_cba"
    ]
   }
  ],

doc/source/notebooks/buildflowmatrix.ipynb

@@ -1639,7 +1639,7 @@
     }
    ],
    "source": [
-    "io.et1_diag.D_fp.head(20)"
+    "io.et1_diag.D_cba.head(20)"
    ]
   },
   {
@@ -1675,7 +1675,7 @@
     }
    ],
    "source": [
-    "io.et1_diag.D_fp.sum(axis=0).reg1"
+    "io.et1_diag.D_cba.sum(axis=0).reg1"
    ]
   },
   {
@@ -1779,7 +1779,7 @@
     }
    ],
    "source": [
-    "io.emissions.D_fp.reg1"
+    "io.emissions.D_cba.reg1"
    ]
   },
   {
@@ -1815,7 +1815,7 @@
     }
    ],
    "source": [
-    "io.et1_diag.D_fp.sum(axis=1).reg1"
+    "io.et1_diag.D_cba.sum(axis=1).reg1"
    ]
   },
   {
@@ -2233,7 +2233,7 @@
     }
    ],
    "source": [
-    "io.et1_diag.D_fp.groupby(level='region', axis=0).sum()"
+    "io.et1_diag.D_cba.groupby(level='region', axis=0).sum()"
    ]
   },
   {
@@ -2782,7 +2782,7 @@
     }
    ],
    "source": [
-    "io.et1_diag.D_fp"
+    "io.et1_diag.D_cba"
    ]
   }
  ],

doc/source/notebooks/load_save_export.ipynb

@@ -497,7 +497,7 @@
     }
    ],
    "source": [
-    "emissions.D_fp"
+    "emissions.D_cba"
    ]
   },
   {
@@ -513,7 +513,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "io.emissions.D_fp.to_excel('/tmp/testmrio/emission_footprints.xlsx')"
+    "io.emissions.D_cba.to_excel('/tmp/testmrio/emission_footprints.xlsx')"
    ]
   },
   {