Convert timeslice id to int, fix failing test

Author: tsmbland

src/muse/new_input/readers.py

@@ -41,7 +41,7 @@ def read_inputs(data_dir):
 
 def read_timeslices_csv(buffer_, con):
     sql = """CREATE TABLE timeslices (
-      id VARCHAR PRIMARY KEY,
+      id BIGINT PRIMARY KEY,
       season VARCHAR,
       day VARCHAR,
       time_of_day VARCHAR,
@@ -133,7 +133,7 @@ def read_demand_slicing_csv(buffer_, con):
     commodity VARCHAR REFERENCES commodities(id),
     region VARCHAR REFERENCES regions(id),
     year BIGINT,
-    timeslice VARCHAR REFERENCES timeslices(id),
+    timeslice BIGINT REFERENCES timeslices(id),
     fraction DOUBLE CHECK (fraction >= 0 AND fraction <= 1),
     PRIMARY KEY (commodity, region, year, timeslice),
     FOREIGN KEY (commodity, region, year) REFERENCES demand(commodity, region, year)
@@ -201,7 +201,7 @@ def calculate_demand(
     all_commodities = commodities["id"].astype(np.dtype("str"))
     all_regions = regions["id"].astype(np.dtype("str"))
     all_years = df_demand.index.get_level_values("year").unique()
-    all_timeslices = timeslices["id"].astype(np.dtype("str"))
+    all_timeslices = timeslices["id"].astype(np.dtype("int"))
 
     # CHECK: all years are specified for each commodity/region combination
     check_all_values_specified(df_demand, ["commodity", "region"], "year", all_years)

tests/test_new_readers.py

@@ -57,7 +57,12 @@ def populate_demand(default_new_input, con, populate_regions, populate_commoditi
 
 @fixture
 def populate_demand_slicing(
-    default_new_input, con, populate_regions, populate_commodities, populate_demand
+    default_new_input,
+    con,
+    populate_regions,
+    populate_commodities,
+    populate_demand,
+    populate_timeslices,
 ):
     from muse.new_input.readers import read_demand_slicing_csv
 
@@ -84,7 +89,7 @@ def populate_timeslices(default_new_input, con):
 def test_read_timeslices_csv(populate_timeslices):
     data = populate_timeslices
     assert len(data["id"]) == 6
-    assert next(iter(data["id"])) == "1"
+    assert next(iter(data["id"])) == 1
     assert next(iter(data["season"])) == "all"
     assert next(iter(data["day"])) == "all"
     assert next(iter(data["time_of_day"])) == "night"
@@ -202,7 +207,7 @@ def test_calculate_demand(
 
     assert set(data.dims) == {"year", "commodity", "region", "timeslice"}
     assert list(data.coords["region"].values) == ["R1"]
-    assert list(data.coords["timeslice"].values) == ["1", "2", "3", "4", "5", "6"]
+    assert set(data.coords["timeslice"].values) == set(range(1, 7))
     assert list(data.coords["year"].values) == [2020, 2050]
     assert set(data.coords["commodity"].values) == {
         "electricity",
@@ -212,7 +217,7 @@ def test_calculate_demand(
         "CO2f",
     }
 
-    assert data.sel(year=2020, commodity="heat", region="R1", timeslice="1") == 1
+    assert data.sel(year=2020, commodity="heat", region="R1", timeslice=1) == 1
 
 
 @mark.xfail