Simulation: Put agents_from_file outside of if

Less code repetition, less confusing, less shitty Co-authored-by: Amrita Goswami <[email protected]>
seldon-code · Mar 22, 2024 · 27e319d · 27e319d
1 parent 2ab75f9
commit 27e319d
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/include/simulation.hpp b/include/simulation.hpp
@@ -73,11 +73,6 @@ class Simulation : public SimulationInterface
                     auto model = std::make_unique<DeGrootModel>( degroot_settings, network );
                     return model;
                 }();
-
-                if( cli_agent_file.has_value() )
-                {
-                    network.agents = agents_from_file<DeGrootModel::AgentT>( cli_agent_file.value() );
-                }
             }
             else if( options.model == Config::Model::DeffuantModel )
             {
@@ -90,11 +85,6 @@ class Simulation : public SimulationInterface
                         deffuant_settings, network, gen, deffuant_settings.use_network );
                     return model;
                 }();
-
-                if( cli_agent_file.has_value() )
-                {
-                    network.agents = agents_from_file<DeffuantModel::AgentT>( cli_agent_file.value() );
-                }
             }
         }
         else if constexpr( std::is_same_v<AgentType, ActivityDrivenModel::AgentT> )
@@ -106,11 +96,11 @@ class Simulation : public SimulationInterface
                 auto model = std::make_unique<ActivityDrivenModel>( activitydriven_settings, network, gen );
                 return model;
             }();
+        }
 
-            if( cli_agent_file.has_value() )
-            {
-                network.agents = agents_from_file<ActivityDrivenModel::AgentT>( cli_agent_file.value() );
-            }
+        if( cli_agent_file.has_value() )
+        {
+            network.agents = agents_from_file<AgentType>( cli_agent_file.value() );
         }
     }