Renaming of output files and other minor adjustments

Author: frkunz

processing.ipynb

@@ -275,23 +275,23 @@
     "title: National generation capacity\n",
     "description: Aggregated generation capacity by technology and country\n",
     "long_description: This data package comprises technology-specific aggregated generation capacities for European countries. The generation capacities are consistently categorized based on fuel and technology. For each European country, various references are used ranging from international (e.g. ENTSOE or EUROSTAT) to national sources from e.g. regulatory authorities. The input data is processed in the script linked below. \n",
-    "version: \"2016-10-23\"\n",
+    "version: \"2016-10-27\"\n",
     "keywords: \n",
     "    - generation capacity\n",
     "    - conventional generation\n",
     "    - renewable generation\n",
     "    - Europe\n",
     "    - Open Power System Data\n",
     "homepage: http://data.open-power-system-data.org/national_generation_capacity/\n",
-    "documentation: https://github.com/Open-Power-System-Data/national_generation_capacity/blob/2016-10-23/main.ipynb\n",
-    "geographical_scope: 28 European countries\n",
-    "last_changes: Revised technology classification, restructured input file format\n",
+    "documentation: https://github.com/Open-Power-System-Data/national_generation_capacity/blob/2016-10-27/main.ipynb\n",
+    "geographical-scope: 28 European countries\n",
+    "last_changes: Revised technology classification, restructured input file format, adjusted input data to final version\n",
     "\n",
     "resources:\n",
-    "    - path: aggregated_capacity.xlsx\n",
+    "    - path: national_generation_capacity.xlsx\n",
     "      format: xlsx\n",
     "      mediatype: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\n",
-    "    - path: aggregated_capacity_stacked.csv\n",
+    "    - path: national_generation_capacity_stacked.csv\n",
     "      format: csv\n",
     "      mediatype: text/csv\n",
     "      schema:    \n",
@@ -344,7 +344,7 @@
     "            - name: technology_level\n",
     "              description: Technology (aggregation or classification by fuel and technology)\n",
     "              type: boolean\n",
-    "    - path: aggregated_capacity_stacked.xlsx\n",
+    "    - path: national_generation_capacity_stacked.xlsx\n",
     "      format: xlsx\n",
     "      mediatype: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\n",
     "      schema:    \n",
@@ -504,17 +504,17 @@
     "             os.path.join('output', 'original_data', data_file))\n",
     "\n",
     "# Write the result to file\n",
-    "data.to_csv(os.path.join(output_path, 'aggregated_capacity_stacked.csv'), \n",
+    "data.to_csv(os.path.join(output_path, 'national_generation_capacity_stacked.csv'), \n",
     "            encoding='utf-8', index_label='ID')\n",
     "\n",
     "# Write the results to excel file\n",
-    "data.to_excel(os.path.join(output_path, 'aggregated_capacity_stacked.xlsx'), \n",
+    "data.to_excel(os.path.join(output_path, 'national_generation_capacity_stacked.xlsx'), \n",
     "              sheet_name='output', index_label='ID')\n",
     "shutil.copy2(os.path.join('input', data_file), \n",
-    "             os.path.join('output', 'aggregated_capacity.xlsx'))\n",
+    "             os.path.join('output', 'national_generation_capacity.xlsx'))\n",
     "\n",
     "# Write the results to sql database\n",
-    "data.to_sql('aggregated_capacity',\n",
+    "data.to_sql('national_generation_capacity_stacked',\n",
     "            sqlite3.connect(os.path.join(output_path, \n",
     "                                         'national_generation_capacity.sqlite')),\n",
     "            if_exists=\"replace\",index_label='ID')\n",