Merge pull request #8848 from par456/8837DisablingExperimentVariations

8837 Disabled sims with strikethrough
APSIMInitiative · Apr 30, 2024 · 3316b8d · 3316b8d
2 parents a8785f0 + ec9b8b8
commit 3316b8d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Models/Core/Run/Playlist.cs b/Models/Core/Run/Playlist.cs
@@ -143,7 +143,7 @@ public string[] GenerateListOfSimulations(List<Simulation> allSimulations = null
 
                         foreach (Experiment exp in allExperiments)
                         {
-                            List<Core.Run.SimulationDescription> expNames = exp.GetSimulationDescriptions().ToList();
+                            List<Core.Run.SimulationDescription> expNames = exp.GetSimulationDescriptions(false).ToList();
                             //match experiment name
                             if (regex.IsMatch(exp.Name.ToLower()))
                             {

diff --git a/Models/Factorial/Experiment.cs b/Models/Factorial/Experiment.cs
@@ -26,18 +26,22 @@ public class Experiment : Model, ISimulationDescriptionGenerator
         public List<string> DisabledSimNames { get; set; }
 
         /// <summary>Gets a list of simulation descriptions.</summary>
-        public List<SimulationDescription> GenerateSimulationDescriptions() => GetSimulationDescriptions().ToList();
+        public List<SimulationDescription> GenerateSimulationDescriptions() => GetSimulationDescriptions(false).ToList();
 
         /// <summary>
         /// Get the total number of simulations generated by this experiment.
         /// </summary>
         public int NumSimulations() => CalculateAllCombinations()?.Count ?? 0;
 
         /// <summary>Gets a list of simulation descriptions.</summary>
-        public IEnumerable<SimulationDescription> GetSimulationDescriptions()
+        public IEnumerable<SimulationDescription> GetSimulationDescriptions(bool includeDisabled = true)
         {
             // Calculate all combinations.
             var allCombinations = CalculateAllCombinations();
+            if (!includeDisabled && DisabledSimNames != null) {
+                allCombinations.RemoveAll(comb => DisabledSimNames.Contains(GetName(comb)));
+            }
+
             if (allCombinations != null)
             {
                 // Find base simulation.
@@ -148,10 +152,6 @@ private List<List<CompositeFactor>> CalculateAllCombinations()
                         allValues.AddRange(factor.GetPermutations());
                 }
 
-                // Remove disabled simulations.
-                if (DisabledSimNames != null)
-                    allValues.RemoveAll(comb => DisabledSimNames.Contains(GetName(comb)));
-
                 return allValues;
             }
             else