Merge pull request #216 from ihmeuw/develop

Develop

Author: rmudambi

CHANGELOG.rst

@@ -1,3 +1,7 @@
+**0.10.16 - 06/30/22**
+
+ - Fix a bug in adding new simulants to a population
+
 **0.10.15 - 06/29/22**
 
  - Added performance reporting

src/vivarium/__about__.py

@@ -13,7 +13,7 @@
 __summary__ = "vivarium is a microsimulation framework built on top of the standard scientific python stack."
 __uri__ = "https://github.com/ihmeuw/vivarium"
 
-__version__ = "0.10.15"
+__version__ = "0.10.16"
 
 __author__ = "The vivarium developers"
 __email__ = "vivarium.dev@gmail.com"

src/vivarium/framework/population/population_view.py

@@ -329,11 +329,14 @@ def _format_update_and_check_preconditions(
                 )
 
             if adding_simulants:
+                state_table_new_simulants = state_table.loc[population_update.index, :]
                 conflicting_columns = [
                     column
                     for column in population_update
-                    if state_table.loc[population_update.index, column].notnull().any()
-                    and not population_update[column].equals(state_table[column])
+                    if state_table_new_simulants[column].notnull().any()
+                    and not population_update[column].equals(
+                        state_table_new_simulants[column]
+                    )
                 ]
                 if conflicting_columns:
                     raise PopulationError(

tests/framework/population/test_population_view.py

@@ -4,7 +4,6 @@
 from typing import Union
 
 import pandas as pd
-import pandas.testing as pdt
 import pytest
 
 from vivarium.framework.population import (
@@ -594,6 +593,27 @@ def test__format_update_and_check_preconditions_time_step_pass(
         assert result[col].equals(update[col])
 
 
+def test__format_update_and_check_preconditions_adding_simulants_replace_identical_data(
+    population_update,
+    update_index,
+):
+    result = PopulationView._format_update_and_check_preconditions(
+        population_update,
+        BASE_POPULATION,
+        COL_NAMES + NEW_COL_NAMES,
+        False,
+        True,
+    )
+    update = PopulationView._coerce_to_dataframe(
+        population_update,
+        COL_NAMES + NEW_COL_NAMES,
+    )
+
+    assert set(result.columns) == set(update)
+    for col in update:
+        assert result[col].equals(update[col])
+
+
 #################################
 # PopulationView.update helpers #
 ##################################################