Merge branch 'develop' into feat/model-2024

eqasim-org · Oct 21, 2024 · 2dd9a22 · 2dd9a22
2 parents 3f1092a + 6abc3a3
commit 2dd9a22
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/org/eqasim/core/simulation/EqasimConfigurator.java b/core/src/main/java/org/eqasim/core/simulation/EqasimConfigurator.java
@@ -174,7 +174,9 @@ protected void registerOptionalConfigGroup(ConfigGroup configGroup, Collection<A
 
     public void addOptionalConfigGroups(Config config) {
         for (ConfigGroup configGroup : optionalConfigGroups.values()) {
-            if (config.getModules().get(configGroup.getName()) != null) {
+            ConfigGroup existingConfigGroup = config.getModules().get(configGroup.getName());
+            // if a config group with the same name exist and is still a generic ConfigGroup instance, we replace it by the optional config group instance
+            if (existingConfigGroup != null && existingConfigGroup.getClass().equals(ConfigGroup.class)) {
                 config.addModule(configGroup);
             }
         }