Merge pull request allfed#29 from florianjehn/main

Adding some minor stuff
lukaszgajewski · Feb 7, 2024 · c4d04bd · c4d04bd
2 parents df09085 + 7f6ad7d
commit c4d04bd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/scripts/ISIMIP_example.ipynb b/scripts/ISIMIP_example.ipynb
@@ -61,14 +61,14 @@
      "text": [
       "Loaded data for Wheat in Y2018.\n",
       "Removed 0 countries with no trade or production.\n",
-      "Prebalanced trade matrix.\n",
-      "Corrected re-exports.\n"
+      "Prebalanced trade matrix.\n"
      ]
     },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
+      "Corrected re-exports.\n",
       "Removed 133 countries from the trade matrix.\n",
       "Removed countries with trade below the 75th percentile.\n",
       "Applied scenario ISIMIP.\n",

diff --git a/src/model.py b/src/model.py
@@ -3,7 +3,6 @@
 import networkx as nx
 import matplotlib.pyplot as plt
 import os
-import sys
 import geopandas as gpd
 import country_converter as coco
 from matplotlib.colors import ListedColormap

diff --git a/tests/test_model.py b/tests/test_model.py
@@ -33,12 +33,7 @@ def get_pytradeshifts_after_reexport(**kwargs) -> PyTradeShifts:
     ("crop", "base_year", "region"),
     [
         ("Wheat", 2018, "Global"),
-        ("Wheat", 2018, "Oceania"),
-        ("Maize", 2018, "Global"),
-        ("Rice", 2018, "Global"),
-        ("Wheat", 2021, "Global"),
         ("Rice", 2021, "Global"),
-        ("Maize", 2021, "Global"),
     ],
 )
 class TestGeneralPyTradeShifts:
@@ -106,12 +101,8 @@ def test_build_graph(self, crop: str, base_year: int, region: str) -> None:
         ("beta"),
         [
             (0.0),
-            (2.0),
-            (-2.0),
             (-1.0),
             (1.0),
-            (-0.01),
-            (0.01),
         ],
     )
     def test_apply_distance_cost(