From 1c9d5bb92bbfd6f6ccba0669f5b0dd128a899fee Mon Sep 17 00:00:00 2001
From: Will Usher <wusher@kth.se>
Date: Thu, 10 Oct 2019 21:36:42 +0200
Subject: [PATCH] Solve issue with index problems and discount rate value

---
 data/DiscountRate.csv |  2 +-
 data/TradeRoute.csv   |  2 +-
 datapackage.json      | 42 ++++++++++++++++++------------------------
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/data/DiscountRate.csv b/data/DiscountRate.csv
index d0c585a..0796805 100644
--- a/data/DiscountRate.csv
+++ b/data/DiscountRate.csv
@@ -1,2 +1,2 @@
 REGION,VALUE
-SIMPLICITY,0.1
+SIMPLICITY,0.05
diff --git a/data/TradeRoute.csv b/data/TradeRoute.csv
index 18847fb..326b28c 100644
--- a/data/TradeRoute.csv
+++ b/data/TradeRoute.csv
@@ -1 +1 @@
-REGION,REGION,REGION,REGION,FUEL,YEAR,VALUE
+REGION,FUEL,YEAR,VALUE
diff --git a/datapackage.json b/datapackage.json
index 909b112..1639b39 100644
--- a/datapackage.json
+++ b/datapackage.json
@@ -2353,21 +2353,6 @@
             "encoding": "utf-8",
             "schema": {
                 "fields": [
-                    {
-                        "name": "REGION",
-                        "type": "string",
-                        "format": "default"
-                    },
-                    {
-                        "name": "REGION",
-                        "type": "string",
-                        "format": "default"
-                    },
-                    {
-                        "name": "REGION",
-                        "type": "string",
-                        "format": "default"
-                    },
                     {
                         "name": "REGION",
                         "type": "string",
@@ -2393,13 +2378,6 @@
                     "0"
                 ],
                 "foreignKeys": [
-                    {
-                        "fields": "REGION",
-                        "reference": {
-                            "resource": "REGION",
-                            "fields": "VALUE"
-                        }
-                    },
                     {
                         "fields": "REGION",
                         "reference": {
@@ -2423,7 +2401,6 @@
                     }
                 ],
                 "primaryKey": [
-                    "REGION",
                     "REGION",
                     "FUEL",
                     "YEAR"
@@ -3219,7 +3196,7 @@
                     }
                 ],
                 "missingValues": [
-                    "1"
+                    "0"
                 ],
                 "foreignKeys": [
                     {
@@ -3390,5 +3367,22 @@
                 ]
             }
         }
+    ],
+    "licenses": [
+        {
+            "name": "CC-BY-4.0",
+            "path": "https://creativecommons.org/licenses/by/4.0/",
+            "title": "Creative Commons Attribution 4.0"
+        }
+    ],
+    "title": "The OSeMOSYS Simplicity Example Model",
+    "name": "osemosys_model_simplicity",
+    "contributors": [
+        {
+            "title": "Will Usher",
+            "email": "wusher@kth.se",
+            "path": "http://www.kth.se/wusher",
+            "role": "author"
+        }
     ]
 }
\ No newline at end of file