diff --git a/Simulator/src/main/java/net/calc/StartAnySimulator.java b/Simulator/src/main/java/net/calc/StartAnySimulator.java index 1376247..b8f664a 100644 --- a/Simulator/src/main/java/net/calc/StartAnySimulator.java +++ b/Simulator/src/main/java/net/calc/StartAnySimulator.java @@ -153,6 +153,16 @@ public String check(final CallcenterRunModel checkedRunModel) { * @see CallcenterSimulatorInterface */ public CallcenterSimulatorInterface run() { + return run(true); + } + + /** + * Startet die Simulation + * @param allowIncreaseDays Darf die Anzahl an simulierten Tagen erhöht werden? (Wenn dies in der Konfiguration eingestellt ist.) + * @return Interface über das auf den lokalen Simulator oder den Wrapper für die Netzwerksimulation zugegriffen werden kann + * @see CallcenterSimulatorInterface + */ + public CallcenterSimulatorInterface run(final boolean allowIncreaseDays) { final SetupData setup=SetupData.getSetup(); CallcenterSimulatorInterface simulator; @@ -166,7 +176,7 @@ public CallcenterSimulatorInterface run() { simulator=new RemoteAndLocalComplexCallcenterSimulator(editModel,setup.getRealMaxThreadNumber(),networkParts,networkServers,networkPorts,networkPasswords); } else { int threadCount=Math.min(setup.getRealMaxThreadNumber(),Runtime.getRuntime().availableProcessors()); - if (setup.increaseNumberOfDays) { + if (setup.increaseNumberOfDays && allowIncreaseDays) { int days=runModel.editModel.days; while (days%threadCount!=0) days++; runModel.editModel.days=days; diff --git a/Simulator/src/main/java/ui/connected/ConnectedSimulation.java b/Simulator/src/main/java/ui/connected/ConnectedSimulation.java index fd00ac6..49bff79 100644 --- a/Simulator/src/main/java/ui/connected/ConnectedSimulation.java +++ b/Simulator/src/main/java/ui/connected/ConnectedSimulation.java @@ -424,7 +424,7 @@ public String initNextSimulation(File logFile) { /* Simulation starten */ StartAnySimulator startAnySimulator=new StartAnySimulator(editModel); s=startAnySimulator.check(); if (s!=null) return s; - simulator=startAnySimulator.run(); + simulator=startAnySimulator.run(false); simulator.start(false); return null; diff --git a/Simulator/src/main/java/ui/help/pages_de/Changelog.html b/Simulator/src/main/java/ui/help/pages_de/Changelog.html index ffde403..76b69af 100644 --- a/Simulator/src/main/java/ui/help/pages_de/Changelog.html +++ b/Simulator/src/main/java/ui/help/pages_de/Changelog.html @@ -14,6 +14,7 @@