Merge pull request #82 from statisticsnorway/bg-column-validation-refactor

Bg column validation refactor

Author: EirikLindstroem

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-model-solver"
-version = "1.4.0"
+version = "1.4.1"
 description = "Class to define, block analyse and solve dynamic and algebraic models numerically"
 authors = ["Benedikt Goodman <benedikt.goodman@ssb.no>"]
 license = "MIT"

src/model_solver/model_solver.py

@@ -844,11 +844,11 @@ def _validate_unique_column_names(df: pd.DataFrame) -> None:
                 2. If any column names are duplicated (error message will include
                 which columns are duplicated and their count)
         """
-        col_counts = df.columns.value_counts().sum()
-        if col_counts == 0:
+        total_columns = df.columns.value_counts().sum()
+        if total_columns == 0:
             raise ValueError("DataFrame has no columns")
 
-        if len(df.columns) > df.columns.nunique():
+        if total_columns > df.columns.nunique():
             counts = df.columns.value_counts()
             duplicates = counts[counts > 1]
             raise ValueError(