Skip to content

Commit

Permalink
Swap simulations (#1777)
Browse files Browse the repository at this point in the history
  • Loading branch information
msevestre authored and rwmcintosh committed Nov 29, 2022
1 parent efdd866 commit 7924bf2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
5 changes: 1 addition & 4 deletions src/OSPSuite.Core/Domain/OutputMapping.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@ public virtual OutputMapping Clone()
};
}

public void UpdateSimulation(ISimulation newSimulation)
{
OutputSelection.UpdateSimulation(newSimulation);
}
public void UpdateSimulation(ISimulation newSimulation) => OutputSelection.UpdateSimulation(newSimulation);

public bool DimensionsAreConsistentForParameterIdentification(DataRepository observedData)
{
Expand Down
6 changes: 6 additions & 0 deletions src/OSPSuite.Core/Domain/OutputMappings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ public void RemoveOutputsReferencing(ISimulation simulation)
.ToList().Each(x => _allOutputMappings.Remove(x));
}

public virtual void SwapSimulation(ISimulation oldSimulation, ISimulation newSimulation)
{
//Use ToList() here as the collection might be modified as we iterate
_allOutputMappings.Where(x => x.UsesSimulation(oldSimulation)).ToList().Each(x => x.UpdateSimulation(newSimulation));
}

private bool outputBelongsToSimulation(ISimulation simulation, OutputMapping outputMapping)
{
return Equals(outputMapping.Simulation, simulation);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,7 @@ public IEnumerable<string> DistinctCompoundNames()

public virtual void SwapSimulations(ISimulation oldSimulation, ISimulation newSimulation)
{
//Use ToList() here as the collection might be modified as we iterate
AllOutputMappings.Where(x => x.UsesSimulation(oldSimulation)).ToList().Each(x => x.UpdateSimulation(newSimulation));
OutputMappings.SwapSimulation(oldSimulation, newSimulation);
AllIdentificationParameters.Each(identificationParameter => identificationParameter.SwapSimulation(oldSimulation, newSimulation));
_allSimulations.Remove(oldSimulation);
_allSimulations.Add(newSimulation);
Expand Down

0 comments on commit 7924bf2

Please sign in to comment.