45 check time period comparison

src/vtlengine/DataTypes/TimeHandling.py

@@ -236,9 +236,16 @@ def _meta_comparison(self, other: Any, py_op: Any) -> Optional[bool]:
             if len(other) == 0:
                 return False
             other = TimePeriodHandler(other)
-        return py_op(
-            DURATION_MAPPING[self.period_indicator], DURATION_MAPPING[other.period_indicator]
-        )
+
+        if DURATION_MAPPING[self.period_indicator] != DURATION_MAPPING[other.period_indicator]:
+            return False
+        if not py_op(self.year, other.year):
+            if py_op.__name__ in ["lt", "gt"] and self.year == other.year:
+                return py_op(self.period_number, other.period_number)
+            return False
+        if py_op.__name__ in ["eq", "ne"] or self.year == other.year:
+            return py_op(self.period_number, other.period_number)
+        return True
 
     def start_date(self, as_date: bool = False) -> Union[date, str]:
         """

src/vtlengine/Operators/HROperators.py

@@ -27,9 +27,7 @@ class HRComparison(Operators.Binary):
 
     @classmethod
     def imbalance_func(cls, x: Any, y: Any) -> Any:
-        if pd.isnull(x) or pd.isnull(y):
-            return None
-        return x - y
+        return None if pd.isnull(x) or pd.isnull(y) else x - y
 
     @staticmethod
     def hr_func(x: Any, y: Any, hr_mode: str, func: Any) -> Any:

tests/Attributes/data/DataSet/output/5-4-1-27-1.csv

@@ -1,5 +1,5 @@
 Id_1,Id_2,Id_3,Id_4,bool_var
-2012,B,Total,Total,True
+2012,B,Total,Total,False
 2012,G,Total,Total,True
 2012,S,Total,Total,True
 2012,M,Total,Total,True

tests/Attributes/data/DataSet/output/5-4-1-28-1.csv

@@ -1,7 +1,7 @@
 Id_1,Id_2,Id_3,Id_4,Me_1,Me_2,At_1,At_2,Me_3
 2012,B,Total,Total,2010Q3,2010Q3,Dolar,Euro,True
-2012,G,Total,Total,2010Q1,2010Q3,Dolar,Euro,True
-2012,S,Total,Total,2010Q1,2010Q3,Dolar,Euro,True
-2012,M,Total,Total,2010Q1,2010Q3,Dolar,Euro,True
-2012,F,Total,Total,2010Q1,2010Q3,Dolar,Euro,True
-2012,W,Total,Total,2010Q1,2010Q3,Dolar,Euro,True
+2012,G,Total,Total,2010Q1,2010Q3,Dolar,Euro,False
+2012,S,Total,Total,2010Q1,2010Q3,Dolar,Euro,False
+2012,M,Total,Total,2010Q1,2010Q3,Dolar,Euro,False
+2012,F,Total,Total,2010Q1,2010Q3,Dolar,Euro,False
+2012,W,Total,Total,2010Q1,2010Q3,Dolar,Euro,False

tests/TimePeriod/conftest.py

@@ -0,0 +1,47 @@
+import json
+import os
+
+import pandas as pd
+import pytest
+
+from vtlengine.API._InternalApi import load_datasets_with_data
+from vtlengine.Exceptions import SemanticError
+
+
+def load_datasets(base_path, code, folder_type):
+    datapoints_path = base_path / 'DataSet' / folder_type
+    input_path = base_path / 'DataStructure' / folder_type
+
+    num_inputs = len([f for f in os.listdir(input_path) if f.startswith(f"{code}-")])
+    datasets = {}
+
+    for i in range(1, num_inputs + 1):
+        with open(input_path / f"{code}-{i}.json", 'r') as file:
+            datastructure = json.load(file)
+        if 'datasets' in datastructure:
+            ds_name = datastructure['datasets'][0]['name']
+            datapoint = {ds_name: pd.read_csv(datapoints_path / f"{code}-{i}.csv")}
+        else:
+            datapoint = None
+        datasets.update(load_datasets_with_data(datastructure, datapoint)[0])
+
+    return datasets
+
+
+@pytest.fixture
+def load_input(request, code):
+    base_path = request.node.get_closest_marker('input_path').args[0]
+    return load_datasets(base_path, code, folder_type="input")
+
+
+@pytest.fixture
+def load_reference(request, code):
+    base_path = request.node.get_closest_marker('input_path').args[0]
+    return load_datasets(base_path, code, folder_type="output")
+
+@pytest.fixture
+def load_error(request, code):
+    with pytest.raises(SemanticError) as context:
+        base_path = request.node.get_closest_marker('input_path').args[0]
+        return load_datasets(base_path, code, folder_type="input")
+    return context.value.args[1]

tests/TimePeriod/data/DataSet/input/1-1.csv

@@ -0,0 +1,49 @@
+CONF_STATUS,EXR_CURRENCY,FREQ,OBS_STATUS,OBS_VALUE,TIME_PERIOD
+,01,M,,112,2000M1
+,02,M,,212,2000M2
+,03,M,A,312,2000M3
+,04,M,A,412,2000M4
+,05,M,A,512,2000M5
+,CNY,M,A,612,2000M6
+,CNY,M,A,712,2000M7
+,CNY,M,A,812,2000M8
+,CNY,M,A,912,2000M9
+,CNY,M,A,1120,2000M10
+,CNY,M,A,1121,2000M11
+,CNY,M,A,1122,2000M12
+,CNY,M,A,112,2001M1
+,CNY,M,A,212,2001M2
+,CNY,M,A,312,2001M3
+,CNY,M,A,412,2001M4
+,CNY,M,A,512,2001M5
+,CNY,M,A,612,2001M6
+,CNY,M,A,712,2001M7
+,CNY,M,A,812,2001M8
+,CNY,M,A,912,2001M9
+,CNY,M,A,1120,2001M10
+,CNY,M,A,1121,2001M11
+,CNY,M,A,1122,2001M12
+,CNY,M,A,112,2002M1
+,CNY,M,A,212,2002M2
+,CNY,M,A,312,2002M3
+,CNY,M,A,412,2002M4
+,CNY,M,A,512,2002M5
+,CNY,M,A,612,2002M6
+,CNY,M,A,712,2002M7
+,CNY,M,A,812,2002M8
+,CNY,M,A,912,2002M9
+,CNY,M,A,1120,2002M10
+,CNY,M,A,1121,2002M11
+,CNY,M,A,1122,2002M12
+,CNY,M,A,112,2003M1
+,CNY,M,A,212,2003M2
+,CNY,M,A,312,2003M3
+,CNY,M,A,412,2003M4
+,CNY,M,A,512,2003M5
+,CNY,M,A,612,2003M6
+,CNY,M,A,712,2003M7
+,CNY,M,A,812,2003M8
+,CNY,M,A,912,2003M9
+,CNY,M,A,1120,2003M10
+,CNY,M,A,1121,2003M11
+,CNY,M,A,1122,2003M12

tests/TimePeriod/data/DataSet/input/2-1.csv

@@ -0,0 +1,49 @@
+CONF_STATUS,EXR_CURRENCY,FREQ,OBS_STATUS,OBS_VALUE,TIME_PERIOD
+,01,M,,112,2000M1
+,02,M,,212,2000M2
+,03,M,A,312,2000M3
+,04,M,A,412,2000M4
+,05,M,A,512,2000M5
+,CNY,M,A,612,2000M6
+,CNY,M,A,712,2000M7
+,CNY,M,A,812,2000M8
+,CNY,M,A,912,2000M9
+,CNY,M,A,1120,2000M10
+,CNY,M,A,1121,2000M11
+,CNY,M,A,1122,2000M12
+,CNY,M,A,112,2001M1
+,CNY,M,A,212,2001M2
+,CNY,M,A,312,2001M3
+,CNY,M,A,412,2001M4
+,CNY,M,A,512,2001M5
+,CNY,M,A,612,2001M6
+,CNY,M,A,712,2001M7
+,CNY,M,A,812,2001M8
+,CNY,M,A,912,2001M9
+,CNY,M,A,1120,2001M10
+,CNY,M,A,1121,2001M11
+,CNY,M,A,1122,2001M12
+,CNY,M,A,112,2002M1
+,CNY,M,A,212,2002M2
+,CNY,M,A,312,2002M3
+,CNY,M,A,412,2002M4
+,CNY,M,A,512,2002M5
+,CNY,M,A,612,2002M6
+,CNY,M,A,712,2002M7
+,CNY,M,A,812,2002M8
+,CNY,M,A,912,2002M9
+,CNY,M,A,1120,2002M10
+,CNY,M,A,1121,2002M11
+,CNY,M,A,1122,2002M12
+,CNY,M,A,112,2003M1
+,CNY,M,A,212,2003M2
+,CNY,M,A,312,2003M3
+,CNY,M,A,412,2003M4
+,CNY,M,A,512,2003M5
+,CNY,M,A,612,2003M6
+,CNY,M,A,712,2003M7
+,CNY,M,A,812,2003M8
+,CNY,M,A,912,2003M9
+,CNY,M,A,1120,2003M10
+,CNY,M,A,1121,2003M11
+,CNY,M,A,1122,2003M12

tests/TimePeriod/data/DataSet/input/3-1.csv

@@ -0,0 +1,49 @@
+CONF_STATUS,EXR_CURRENCY,FREQ,OBS_STATUS,OBS_VALUE,TIME_PERIOD
+,01,M,,112,2000M1
+,02,M,,212,2000M2
+,03,M,A,312,2000M3
+,04,M,A,412,2000M4
+,05,M,A,512,2000M5
+,CNY,M,A,612,2000M6
+,CNY,M,A,712,2000M7
+,CNY,M,A,812,2000M8
+,CNY,M,A,912,2000M9
+,CNY,M,A,1120,2000M10
+,CNY,M,A,1121,2000M11
+,CNY,M,A,1122,2000M12
+,CNY,M,A,112,2001M1
+,CNY,M,A,212,2001M2
+,CNY,M,A,312,2001M3
+,CNY,M,A,412,2001M4
+,CNY,M,A,512,2001M5
+,CNY,M,A,612,2001M6
+,CNY,M,A,712,2001M7
+,CNY,M,A,812,2001M8
+,CNY,M,A,912,2001M9
+,CNY,M,A,1120,2001M10
+,CNY,M,A,1121,2001M11
+,CNY,M,A,1122,2001M12
+,CNY,M,A,112,2002M1
+,CNY,M,A,212,2002M2
+,CNY,M,A,312,2002M3
+,CNY,M,A,412,2002M4
+,CNY,M,A,512,2002M5
+,CNY,M,A,612,2002M6
+,CNY,M,A,712,2002M7
+,CNY,M,A,812,2002M8
+,CNY,M,A,912,2002M9
+,CNY,M,A,1120,2002M10
+,CNY,M,A,1121,2002M11
+,CNY,M,A,1122,2002M12
+,CNY,M,A,112,2003M1
+,CNY,M,A,212,2003M2
+,CNY,M,A,312,2003M3
+,CNY,M,A,412,2003M4
+,CNY,M,A,512,2003M5
+,CNY,M,A,612,2003M6
+,CNY,M,A,712,2003M7
+,CNY,M,A,812,2003M8
+,CNY,M,A,912,2003M9
+,CNY,M,A,1120,2003M10
+,CNY,M,A,1121,2003M11
+,CNY,M,A,1122,2003M12

tests/TimePeriod/data/DataSet/input/4-1.csv

@@ -0,0 +1,49 @@
+CONF_STATUS,EXR_CURRENCY,FREQ,OBS_STATUS,OBS_VALUE,TIME_PERIOD
+,01,M,,112,2000M1
+,02,M,,212,2000M2
+,03,M,A,312,2000M3
+,04,M,A,412,2000M4
+,05,M,A,512,2000M5
+,CNY,M,A,612,2000M6
+,CNY,M,A,712,2000M7
+,CNY,M,A,812,2000M8
+,CNY,M,A,912,2000M9
+,CNY,M,A,1120,2000M10
+,CNY,M,A,1121,2000M11
+,CNY,M,A,1122,2000M12
+,CNY,M,A,112,2001M1
+,CNY,M,A,212,2001M2
+,CNY,M,A,312,2001M3
+,CNY,M,A,412,2001M4
+,CNY,M,A,512,2001M5
+,CNY,M,A,612,2001M6
+,CNY,M,A,712,2001M7
+,CNY,M,A,812,2001M8
+,CNY,M,A,912,2001M9
+,CNY,M,A,1120,2001M10
+,CNY,M,A,1121,2001M11
+,CNY,M,A,1122,2001M12
+,CNY,M,A,112,2002M1
+,CNY,M,A,212,2002M2
+,CNY,M,A,312,2002M3
+,CNY,M,A,412,2002M4
+,CNY,M,A,512,2002M5
+,CNY,M,A,612,2002M6
+,CNY,M,A,712,2002M7
+,CNY,M,A,812,2002M8
+,CNY,M,A,912,2002M9
+,CNY,M,A,1120,2002M10
+,CNY,M,A,1121,2002M11
+,CNY,M,A,1122,2002M12
+,CNY,M,A,112,2003M1
+,CNY,M,A,212,2003M2
+,CNY,M,A,312,2003M3
+,CNY,M,A,412,2003M4
+,CNY,M,A,512,2003M5
+,CNY,M,A,612,2003M6
+,CNY,M,A,712,2003M7
+,CNY,M,A,812,2003M8
+,CNY,M,A,912,2003M9
+,CNY,M,A,1120,2003M10
+,CNY,M,A,1121,2003M11
+,CNY,M,A,1122,2003M12

tests/TimePeriod/data/DataSet/input/5-1.csv

@@ -0,0 +1,49 @@
+CONF_STATUS,EXR_CURRENCY,FREQ,OBS_STATUS,OBS_VALUE,TIME_PERIOD
+,01,M,,112,2000M1
+,02,M,,212,2000M2
+,03,M,A,312,2000M3
+,04,M,A,412,2000M4
+,05,M,A,512,2000M5
+,CNY,M,A,612,2000M6
+,CNY,M,A,712,2000M7
+,CNY,M,A,812,2000M8
+,CNY,M,A,912,2000M9
+,CNY,M,A,1120,2000M10
+,CNY,M,A,1121,2000M11
+,CNY,M,A,1122,2000M12
+,CNY,M,A,112,2001M1
+,CNY,M,A,212,2001M2
+,CNY,M,A,312,2001M3
+,CNY,M,A,412,2001M4
+,CNY,M,A,512,2001M5
+,CNY,M,A,612,2001M6
+,CNY,M,A,712,2001M7
+,CNY,M,A,812,2001M8
+,CNY,M,A,912,2001M9
+,CNY,M,A,1120,2001M10
+,CNY,M,A,1121,2001M11
+,CNY,M,A,1122,2001M12
+,CNY,M,A,112,2002M1
+,CNY,M,A,212,2002M2
+,CNY,M,A,312,2002M3
+,CNY,M,A,412,2002M4
+,CNY,M,A,512,2002M5
+,CNY,M,A,612,2002M6
+,CNY,M,A,712,2002M7
+,CNY,M,A,812,2002M8
+,CNY,M,A,912,2002M9
+,CNY,M,A,1120,2002M10
+,CNY,M,A,1121,2002M11
+,CNY,M,A,1122,2002M12
+,CNY,M,A,112,2003M1
+,CNY,M,A,212,2003M2
+,CNY,M,A,312,2003M3
+,CNY,M,A,412,2003M4
+,CNY,M,A,512,2003M5
+,CNY,M,A,612,2003M6
+,CNY,M,A,712,2003M7
+,CNY,M,A,812,2003M8
+,CNY,M,A,912,2003M9
+,CNY,M,A,1120,2003M10
+,CNY,M,A,1121,2003M11
+,CNY,M,A,1122,2003M12