diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..ee87050 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,25 @@ +name: CI + +on: + push: + branches: ["master"] + pull_request: + branches: ["**"] + +jobs: + test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up Java 11 + uses: actions/setup-java@v4 + with: + java-version: "11" + distribution: temurin + cache: maven + + - name: Run tests + working-directory: structSimV1 + run: mvn test diff --git a/README.md b/README.md index b54e40d..e98b2ce 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,113 @@ To use our framework to your project you have to add the "structSimV1.jar" to yo A tutorial (structSimTutorial.pdf) is available to help you to begin with our framework. Some example are also described in this tutorial. +## Citation + +If you use this framework in your research, please cite the following paper: + +> René Schumann, Caroline Taramarcaz. **Towards Systematic Testing of Complex Interacting Systems.** In *Proceedings of the Workshop on Testing Extra-Functional Properties and Quality Characteristics of Software Systems (ITEQS)*, CEUR Workshop Proceedings, Vol. 2397, pp. 55–, 2019. https://ceur-ws.org/Vol-2397/paper8.pdf + If you have some questions/remarks about this project, you can consult the official page of the project at this address : https://www.hevs.ch/fr/mini-sites/projets-produits/si-lab/projets/structured-simulation--a-framework-for-the-automated-analysis-of-adaptive-systems-8640 And in case, don't hesitate to contact us. + +## Running the simulation (mock mode) + +The framework ships with a mock simulator (`SimpleSimulationHandler`) that lets you run without a real external simulator. + +Ready-to-use example files are in [`examples/simple/`](examples/simple/). Copy them as described below. + +### 1. Copy `config.properties` into the classpath + +Copy [`examples/simple/config.properties`](examples/simple/config.properties) to `structSimV1/src/main/resources/config.properties`: + +```bash +cp examples/simple/config.properties structSimV1/src/main/resources/config.properties +``` + +```properties +pathOUT = /tmp/structsim-results +pathParameters = parameters.txt +pathSimulator = /tmp/structsim-simulator +pathToSimulatorResultFile = /tmp/structsim-simulator/results/results.txt +cuttOfPlanning = 10 +typeCuttOfPlanning = INT +``` + +| Key | Description | +|-----|-------------| +| `pathOUT` | Folder where results and `SummaryFile.txt` are written | +| `pathParameters` | Name of the parameters file — loaded from the classpath, so place it in `src/main/resources/` | +| `pathSimulator` | Folder where per-simulation sub-folders are created | +| `pathToSimulatorResultFile` | Result file the simulator creates after each run | +| `typeCuttOfPlanning` | When to stop generating simulations — `INT`, `CRITERIA`, `HOURS`, `MINUTES`, or `DAY` | +| `cuttOfPlanning` | Threshold value for the chosen stop type (see below) | + +**How `typeCuttOfPlanning` works:** + +The framework builds a tree of simulations by applying modifiers on top of each other. This setting controls when it stops growing the tree: + +- `INT` — stops after N outer loop iterations (e.g. `10` means 10 rounds of applying all modifiers). Good for a quick bounded run. +- `CRITERIA` — prunes any branch whose cumulative probability drops below the threshold (e.g. `0.15` = stop exploring paths less likely than 15%). Each modifier has a probability; they multiply as modifiers are combined. Good for skipping unlikely scenarios. +- `HOURS` / `MINUTES` / `DAY` — runs for a fixed wall-clock duration regardless of how many simulations are generated. + +> **Note:** the file must have the `.properties` extension. + +### 2. Copy `parameters.txt` into the classpath + +Copy [`examples/simple/parameters.txt`](examples/simple/parameters.txt) to `structSimV1/src/main/resources/parameters.txt`: + +```bash +cp examples/simple/parameters.txt structSimV1/src/main/resources/parameters.txt +``` + +``` +val1=1 +val2=2 +val3=3 +val4=4 +val5=5 +``` + +One `key=value` pair per line. Values must be numbers. + +### 3. Configure modifiers in `Simulation.java` + +Open `structSimV1/src/main/java/ch/hevs/silab/structuredsim/gluecode/Simulation.java` and edit the modifiers list. Each `ConcreteModifier` takes `(parameterKey, operator, delta, probability)`: + +```java +modifiers.add(new ConcreteModifier("val2", '+', 1.0, 0.5)); +modifiers.add(new ConcreteModifier("val2", '+', 10.0, 0.5)); +``` + +Supported operators: `+`, `-`, `*`, `/` + +The `probability` field is only used for pruning when `typeCuttOfPlanning = CRITERIA`. With `INT` mode it has no effect on how many simulations run. + +### 4. Create output directories and run + +```bash +mkdir -p /tmp/structsim-results /tmp/structsim-simulator +cd structSimV1 +mvn exec:java -Dexec.mainClass=ch.hevs.silab.structuredsim.gluecode.Simulation +``` + +Results are written to `pathOUT/SummaryFile.txt`. + +--- + +## Quick start — run the built-in example + +The `examples/simple/` directory is a ready-to-run project matching the tutorial. It modifies `val2` with two modifiers (`+1` and `+10`) and runs 10 iterations. + +```bash +cd examples/simple +./run.sh +``` + +The script will: +1. Build and install `structSimV1` to your local Maven repo +2. Create `/tmp/structsim-results` and `/tmp/structsim-simulator` +3. Run the simulation +4. Print `SummaryFile.txt` when done diff --git a/examples/simple/config.properties b/examples/simple/config.properties new file mode 100644 index 0000000..d27816b --- /dev/null +++ b/examples/simple/config.properties @@ -0,0 +1,15 @@ +# Folder where results and SummaryFile.txt are written +pathOUT = /tmp/structsim-results + +# Name of the parameters file - must be on the classpath (src/main/resources/) +pathParameters = parameters.txt + +# Folder where per-simulation sub-folders are created +pathSimulator = /tmp/structsim-simulator + +# Result file the simulator creates after each run +pathToSimulatorResultFile = /tmp/structsim-simulator/results/results.txt + +# Stop after 10 outer exploration loop iterations +cuttOfPlanning = 10 +typeCuttOfPlanning = INT diff --git a/examples/simple/parameters.txt b/examples/simple/parameters.txt new file mode 100644 index 0000000..a1aff25 --- /dev/null +++ b/examples/simple/parameters.txt @@ -0,0 +1,5 @@ +val1=1 +val2=2 +val3=3 +val4=4 +val5=5 diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml new file mode 100644 index 0000000..929dffb --- /dev/null +++ b/examples/simple/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + example + simple-simulation + 1.0-SNAPSHOT + jar + + + 11 + 11 + + + + + hevs.ch.silab + hevs.ch.silab + 0.0.1-SNAPSHOT + + + + + + + org.codehaus.mojo + exec-maven-plugin + 3.1.0 + + example.Simulation + + + + + diff --git a/examples/simple/run.sh b/examples/simple/run.sh new file mode 100755 index 0000000..555750a --- /dev/null +++ b/examples/simple/run.sh @@ -0,0 +1,31 @@ +#!/bin/bash +set -e + +REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)" +EXAMPLE_DIR="$REPO_ROOT/examples/simple" +BUILD_DIR="$EXAMPLE_DIR/target/classes" + +STRUCT_CLASSES="$REPO_ROOT/structSimV1/target/classes" +LOG4J_JAR="$HOME/.m2/repository/org/apache/logging/log4j/log4j-api/2.24.3/log4j-api-2.24.3.jar" + +echo "==> Compiling structSimV1..." +cd "$REPO_ROOT/structSimV1" +mvn compile -q + +echo "==> Creating output directories..." +mkdir -p /tmp/structsim-results /tmp/structsim-simulator +mkdir -p "$BUILD_DIR" + +echo "==> Compiling example..." +javac -cp "$STRUCT_CLASSES:$LOG4J_JAR" \ + -d "$BUILD_DIR" \ + "$EXAMPLE_DIR/src/main/java/example/Simulation.java" + +echo "==> Running simulation..." +java -cp "$BUILD_DIR:$STRUCT_CLASSES:$LOG4J_JAR:$EXAMPLE_DIR/src/main/resources" \ + example.Simulation + +echo "" +echo "Done! Results written to /tmp/structsim-results/SummaryFile.txt" +echo "" +cat /tmp/structsim-results/SummaryFile.txt diff --git a/examples/simple/src/main/java/example/Simulation.java b/examples/simple/src/main/java/example/Simulation.java new file mode 100644 index 0000000..10af864 --- /dev/null +++ b/examples/simple/src/main/java/example/Simulation.java @@ -0,0 +1,29 @@ +package example; + +import ch.hevs.silab.structuredsim.gluecode.ConcreteModifier; +import ch.hevs.silab.structuredsim.gluecode.SimpleSimulationHandler; +import ch.hevs.silab.structuredsim.interfaces.AModifier; +import ch.hevs.silab.structuredsim.interfaces.StartProgram; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +public class Simulation extends StartProgram { + + public static void main(String[] args) throws IOException { + + InputStream config = Simulation.class + .getClassLoader() + .getResourceAsStream("config.properties"); + + List modifiers = new ArrayList<>(); + modifiers.add(new ConcreteModifier("val2", '+', 1.0, 0.5)); + modifiers.add(new ConcreteModifier("val2", '+', 10.0, 0.5)); + + SimpleSimulationHandler ssh = new SimpleSimulationHandler(modifiers); + + startProgram(config, ssh); + } +} diff --git a/examples/simple/src/main/resources/config.properties b/examples/simple/src/main/resources/config.properties new file mode 100644 index 0000000..f9a2c05 --- /dev/null +++ b/examples/simple/src/main/resources/config.properties @@ -0,0 +1,6 @@ +pathOUT = /tmp/structsim-results +pathParameters = parameters.txt +pathSimulator = /tmp/structsim-simulator +pathToSimulatorResultFile = /tmp/structsim-simulator/results/results.txt +cuttOfPlanning = 10 +typeCuttOfPlanning = INT diff --git a/examples/simple/src/main/resources/parameters.txt b/examples/simple/src/main/resources/parameters.txt new file mode 100644 index 0000000..a1aff25 --- /dev/null +++ b/examples/simple/src/main/resources/parameters.txt @@ -0,0 +1,5 @@ +val1=1 +val2=2 +val3=3 +val4=4 +val5=5 diff --git a/structSimV1/pom.xml b/structSimV1/pom.xml index 3caf5bb..b82c8e2 100644 --- a/structSimV1/pom.xml +++ b/structSimV1/pom.xml @@ -21,11 +21,6 @@ 3.8.1 test - - com.hynnet - jacob - 1.18 - org.apache.logging.log4j log4j-api @@ -34,7 +29,7 @@ org.junit.jupiter junit-jupiter - RELEASE + 5.11.4 test diff --git a/structSimV1/src/main/java/ch/hevs/silab/structuredsim/gluecode/SimpleSimulationHandler.java b/structSimV1/src/main/java/ch/hevs/silab/structuredsim/gluecode/SimpleSimulationHandler.java index 70dc232..d6cd616 100644 --- a/structSimV1/src/main/java/ch/hevs/silab/structuredsim/gluecode/SimpleSimulationHandler.java +++ b/structSimV1/src/main/java/ch/hevs/silab/structuredsim/gluecode/SimpleSimulationHandler.java @@ -140,12 +140,13 @@ public void writeParametersFile(Vector setOfParameters, String locati @Override public void startSimulation(String pathToInputFile) { - - - /* String resultFile = options.getPathToSimulatorResultFile(); - MySimulator.run(pathToInputFile, resultFile);*/ - + new File(resultFile).getParentFile().mkdirs(); + try { + new File(resultFile).createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } } @Override diff --git a/structSimV1/src/main/java/ch/hevs/silab/structuredsim/util/FileManagement.java b/structSimV1/src/main/java/ch/hevs/silab/structuredsim/util/FileManagement.java index 43c30e7..410c0af 100644 --- a/structSimV1/src/main/java/ch/hevs/silab/structuredsim/util/FileManagement.java +++ b/structSimV1/src/main/java/ch/hevs/silab/structuredsim/util/FileManagement.java @@ -117,13 +117,13 @@ public String contentOfAFile() throws IOException { */ public void moveFile(String originFile, String destinationFile) { Path originPath = Paths.get(originFile); + if (!Files.exists(originPath)) return; Path destinationPath = Paths.get(destinationFile); try { Files.move(originPath, destinationPath, REPLACE_EXISTING); } catch (IOException e) { logger.error("Impossible to move this file"); - //System.out.println("Impossible to move this file"); e.printStackTrace(); } } @@ -144,7 +144,6 @@ public void copyFile(String file, String destination) { Files.copy(fileToCopy.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING); } catch (Exception e) { logger.error("This file in this folder already exist"); - //e.printStackTrace(); } } diff --git a/structSimV1/src/test/java/hevs/ch/silab/hevs/ch/silab/integrationTests/IntegrationTests.java b/structSimV1/src/test/java/hevs/ch/silab/hevs/ch/silab/integrationTests/IntegrationTests.java index 42aec4c..ae4937a 100644 --- a/structSimV1/src/test/java/hevs/ch/silab/hevs/ch/silab/integrationTests/IntegrationTests.java +++ b/structSimV1/src/test/java/hevs/ch/silab/hevs/ch/silab/integrationTests/IntegrationTests.java @@ -36,7 +36,8 @@ * @author Matthias Gaillard */ public class IntegrationTests extends TestCase { - private String pathOUT = "C:/maigration/original/structSim/structSimV1/results"; + private String pathOUT = System.getProperty("java.io.tmpdir").replace("\\", "/") + "/structsim-results"; + private String pathSIM = System.getProperty("java.io.tmpdir").replace("\\", "/") + "/structsim-simulator"; @@ -176,14 +177,16 @@ private void runAndAssertSummaryFile( // Arrange cleanOutputDirectory(); + Files.createDirectories(Paths.get(pathOUT)); + Files.createDirectories(Paths.get(pathSIM)); File tempDir = Files.createTempDirectory("structsim-test").toFile(); File tempConfig = new File(tempDir, "config.properties"); String configContent = "pathOUT = " + pathOUT + "\n" + "pathParameters = parameters.txt\n" + - "pathSimulator = c:/mySimulator\n" + - "pathToSimulatorResultFile = c:/mySimulator/results/results.txt\n" + + "pathSimulator = " + pathSIM + "\n" + + "pathToSimulatorResultFile = " + pathSIM + "/results/results.txt\n" + "cuttOfPlanning = " + cuttOfPlanning + "\n" + "typeCuttOfPlanning = " + typeCuttOfPlanning + "\n"; try (BufferedWriter bw = new BufferedWriter(new FileWriter(tempConfig))) { @@ -380,8 +383,8 @@ public void test_CRITERIAcutoffType_valueZero() throws IOException { String configContent = "pathOUT = " + pathOUT + "\n" + "pathParameters = parameters.txt\n" + - "pathSimulator = c:/mySimulator\n" + - "pathToSimulatorResultFile = c:/mySimulator/results/results.txt\n" + + "pathSimulator = " + pathSIM + "\n" + + "pathToSimulatorResultFile = " + pathSIM + "/results/results.txt\n" + "cuttOfPlanning = " + cuttOfPlanning + "\n" + "typeCuttOfPlanning = " + typeCuttOfPlanning + "\n"; try (BufferedWriter bw = new BufferedWriter(new FileWriter(tempConfig))) { diff --git a/structSimV1/src/test/java/hevs/ch/silab/hevs/ch/silab/integrationTests/StartProgramTests.java b/structSimV1/src/test/java/hevs/ch/silab/hevs/ch/silab/integrationTests/StartProgramTests.java index d32459b..da1468d 100644 --- a/structSimV1/src/test/java/hevs/ch/silab/hevs/ch/silab/integrationTests/StartProgramTests.java +++ b/structSimV1/src/test/java/hevs/ch/silab/hevs/ch/silab/integrationTests/StartProgramTests.java @@ -7,6 +7,8 @@ import ch.hevs.silab.structuredsim.gluecode.Simulation; import ch.hevs.silab.structuredsim.interfaces.AModifier; import junit.framework.TestCase; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.io.*; @@ -30,14 +32,32 @@ public class StartProgramTests extends TestCase { private double delta = 1e-9; - private String pathOUT = "C:/maigration/original/structSim/structSimV1/results"; + private String pathOUT = System.getProperty("java.io.tmpdir").replace("\\", "/") + "/structsim-results"; + private String pathSIM = System.getProperty("java.io.tmpdir").replace("\\", "/") + "/structsim-simulator"; + @BeforeEach + @Override + protected void setUp() throws Exception { + Path resultsPath = Paths.get(pathOUT); + if (Files.exists(resultsPath)) { + Files.walk(resultsPath) + .sorted(Comparator.reverseOrder()) + .filter(p -> !p.equals(resultsPath)) + .forEach(p -> { + try { Files.delete(p); } + catch (IOException e) { e.printStackTrace(); } + }); + } + Files.createDirectories(resultsPath); + Files.createDirectories(Paths.get(pathSIM)); + } + /** * Delete the output files after each test - * Generated by Claude * @throws Exception */ + @AfterEach @Override protected void tearDown() throws Exception { Path resultsPath = Paths.get(pathOUT); @@ -65,8 +85,8 @@ public void startProgram_shouldGenerateCorrectSummaryFile() throws IOException { String configContent = "pathOUT = " + pathOUT + "\n" + "pathParameters = parameters.txt\n" + - "pathSimulator = c:/mySimulator\n" + - "pathToSimulatorResultFile = c:/mySimulator/results/results.txt\n" + + "pathSimulator = " + pathSIM + "\n" + + "pathToSimulatorResultFile = " + pathSIM + "/results/results.txt\n" + "cuttOfPlanning = 0.15\n" + "typeCuttOfPlanning = CRITERIA\n"; @@ -90,29 +110,27 @@ public void startProgram_shouldGenerateCorrectSummaryFile() throws IOException { throw new RuntimeException(e); } - // Assert, Claude generated - File summaryFile = new File("results/SummaryFile.txt"); + // Assert + File summaryFile = new File(pathOUT + "/SummaryFile.txt"); long timeout = 15_000; // wait 15 seconds long start = System.currentTimeMillis(); List lines = new ArrayList<>(); + int expectedLineCount = 8; while (System.currentTimeMillis() - start < timeout) { if (summaryFile.exists()) { lines.clear(); - boolean foundBlankLine = false; try (BufferedReader br = new BufferedReader(new FileReader(summaryFile))) { String line; while ((line = br.readLine()) != null) { - if (line.trim().isEmpty()) { - foundBlankLine = true; - break; + if (!line.trim().isEmpty()) { + lines.add(line); } - lines.add(line); } } catch (IOException e) { // File still being written } - if (foundBlankLine) break; + if (lines.size() >= expectedLineCount) break; } try { Thread.sleep(200); diff --git a/structSimV1/src/test/resources/parameters.txt b/structSimV1/src/test/resources/parameters.txt new file mode 100644 index 0000000..11fbfb3 --- /dev/null +++ b/structSimV1/src/test/resources/parameters.txt @@ -0,0 +1 @@ +val1=1.0 diff --git a/structSimV1/target/classes/META-INF/MANIFEST.MF b/structSimV1/target/classes/META-INF/MANIFEST.MF deleted file mode 100644 index df1e4cd..0000000 --- a/structSimV1/target/classes/META-INF/MANIFEST.MF +++ /dev/null @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -Built-By: caroline.taramarc -Build-Jdk: 1.8.0_131 -Created-By: Maven Integration for Eclipse - diff --git a/structSimV1/target/classes/META-INF/maven/hevs.ch.silab/hevs.ch.silab/pom.properties b/structSimV1/target/classes/META-INF/maven/hevs.ch.silab/hevs.ch.silab/pom.properties deleted file mode 100644 index 0d00a58..0000000 --- a/structSimV1/target/classes/META-INF/maven/hevs.ch.silab/hevs.ch.silab/pom.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Generated by Maven Integration for Eclipse -#Mon Sep 11 07:54:33 CEST 2017 -version=0.0.1-SNAPSHOT -groupId=hevs.ch.silab -m2e.projectName=StructuredSimulationFramework -m2e.projectLocation=C\:\\Users\\caroline.taramarc\\Documents\\StructuredSimulationFramework\\StructSimWorkspace\\StructuredSimulationFramework\\code -artifactId=hevs.ch.silab diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Environment.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Environment.class deleted file mode 100644 index 1e7b71e..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Environment.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/ExperimentPlanGenerator.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/ExperimentPlanGenerator.class deleted file mode 100644 index 6ec01af..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/ExperimentPlanGenerator.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/ExperimentResultHandler.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/ExperimentResultHandler.class deleted file mode 100644 index 486fa26..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/ExperimentResultHandler.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/ExperimentSimulatorHandler.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/ExperimentSimulatorHandler.class deleted file mode 100644 index 3d13c97..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/ExperimentSimulatorHandler.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Measure.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Measure.class deleted file mode 100644 index 15c1af6..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Measure.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Options.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Options.class deleted file mode 100644 index b20b864..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Options.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Parameter.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Parameter.class deleted file mode 100644 index 75fdd38..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/experimenthandling/Parameter.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/AModifier.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/AModifier.class deleted file mode 100644 index 452223f..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/AModifier.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/ASimulationSystemHandler.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/ASimulationSystemHandler.class deleted file mode 100644 index 6b9c248..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/ASimulationSystemHandler.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IExtractMeasures.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IExtractMeasures.class deleted file mode 100644 index ae3ac7a..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IExtractMeasures.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IManageModifier.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IManageModifier.class deleted file mode 100644 index 9498844..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IManageModifier.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IManageParametersFile.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IManageParametersFile.class deleted file mode 100644 index 2080e84..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IManageParametersFile.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IStartSimulation.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IStartSimulation.class deleted file mode 100644 index 159ff4d..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IStartSimulation.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IStopProgram.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IStopProgram.class deleted file mode 100644 index 21e704c..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/IStopProgram.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/StartProgram.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/StartProgram.class deleted file mode 100644 index 6d4269d..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/interfaces/StartProgram.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/ModifierClass1.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/ModifierClass1.class deleted file mode 100644 index f689973..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/ModifierClass1.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/ModifierClass2.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/ModifierClass2.class deleted file mode 100644 index 84daa2d..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/ModifierClass2.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/SimpleSimulationHandler.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/SimpleSimulationHandler.class deleted file mode 100644 index ebde242..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/SimpleSimulationHandler.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/Simulation.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/Simulation.class deleted file mode 100644 index c659573..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/Simulation.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/config.properties b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/config.properties deleted file mode 100644 index 7f97094..0000000 --- a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/mockUpSim/config.properties +++ /dev/null @@ -1,15 +0,0 @@ -# For all path the folder must be created -pathOUT = ./ResultSim -pathParameters = ./data/simulation/parameters.txt -pathSimulator = c:/mySimulator -#the place where the simulator create automatically results file for a simulation. This file need to be save in corresponding simulator folder. -pathToSimulatorResultFile = c:/mySimulator/results/results.txt -# CuttOfPlanning = How many time must the planning run. -cuttOfPlanning = 10 -# type of cuttOfPlanning : INT, HOURS, MINUTES, DAY, CRITERIA -# INT = iteration or laps. -# Criteria = based on the probability. The numbers must be between 1 and 0. ex.:0.5 -typeCuttOfPlanning = INT -# Key/Id of the parameter to change -# If your parameters File is an array, please create key/id for each parameters -valueToChange = val1 diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/ModifClass1.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/ModifClass1.class deleted file mode 100644 index 693edaa..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/ModifClass1.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/VissimDemo.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/VissimDemo.class deleted file mode 100644 index 9c5ef96..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/VissimDemo.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/VissimSimulationHandler.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/VissimSimulationHandler.class deleted file mode 100644 index 9493ca8..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/VissimSimulationHandler.class and /dev/null differ diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/configVissim.properties b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/configVissim.properties deleted file mode 100644 index c343247..0000000 --- a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/configVissim.properties +++ /dev/null @@ -1,12 +0,0 @@ -# For all path the folder must be created -pathOUT = ./ResultSim -pathParameters = ./src/main/java/simulators/vissim/matrixOD.fma -pathSimulator = c:/mySimulator -# CuttOfPlanning = How many time must the planning run. -cuttOfPlanning = 10 -# type of cuttOfPlanning : INT, HOURS, MINUTES, DAY -# INT = iteration or laps. -typeCuttOfPlanning = INT -# Key/Id of the parameter to change -# If your parameters File is an array, please create key/id for each parameters -valueToChange = 4.2 \ No newline at end of file diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/matrixOD.fma b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/matrixOD.fma deleted file mode 100644 index 86b64fd..0000000 --- a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/matrixOD.fma +++ /dev/null @@ -1,9 +0,0 @@ - 0.0 1.0 - 1 - 5 - 1 2 3 4 5 - 0 0 1000 0 0 - 0 0 0 0 0 - 0 0 0 0 0 - 0 0 0 0 0 - 0 0 0 0 0 diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/model_mreza.layx b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/model_mreza.layx deleted file mode 100644 index d759ce7..0000000 --- a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/model_mreza.layx +++ /dev/null @@ -1,876 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/model_mrezaDA.inpx b/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/model_mrezaDA.inpx deleted file mode 100644 index 3d1b8aa..0000000 --- a/structSimV1/target/classes/ch/hevs/silab/structuredsim/simulators/vissim/model_mrezaDA.inpx +++ /dev/null @@ -1,2688 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/structSimV1/target/classes/ch/hevs/silab/structuredsim/util/FileManagement.class b/structSimV1/target/classes/ch/hevs/silab/structuredsim/util/FileManagement.class deleted file mode 100644 index bfbaf32..0000000 Binary files a/structSimV1/target/classes/ch/hevs/silab/structuredsim/util/FileManagement.class and /dev/null differ diff --git a/structSimV1/target/classes/log4j2.xml b/structSimV1/target/classes/log4j2.xml deleted file mode 100644 index 290e1d0..0000000 --- a/structSimV1/target/classes/log4j2.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/structSimV1/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/structSimV1/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 111c429..0000000 --- a/structSimV1/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,24 +0,0 @@ -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\ExperimentHandling\Environment.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\simulators\mockUpSim\ModifierClass2.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\ExperimentHandling\Measure.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\util\FileManagement.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\ExperimentHandling\Parameters.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\ExperimentHandling\Options.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\interfaces\IStopProgram.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\interfaces\IStartSimulation.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\interfaces\IChangeParameters.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\simulators\mockUpSim\Simulation.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\ExperimentHandling\ExperimentPlanGenerator.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\interfaces\AModifier.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\interfaces\Measures.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\ExperimentHandling\ExperimentSimulatorHandler.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\interfaces\IManageModifier.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\ExperimentHandling\ExperimentResultHandler.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\interfaces\IManageParametersFile.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\simulators\mockUpSim\ModifierClass1.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\interfaces\StartProgram.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\hevs\ch\silab\hevs\ch\silab\App.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\interfaces\SimulationSystemHandler.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\interfaces\IExtractMeasures.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\structuredSim\interfaces\IModifier.java -C:\Users\caroline.taramarc\Documents\StructuredSimulationFramework\StructSimWorkspace\hevs.ch.silab\src\main\java\simulators\mockUpSim\SimpleSimulationHandler.java diff --git a/structSimV1/target/test-classes/hevs/ch/silab/hevs/ch/silab/AppTest.class b/structSimV1/target/test-classes/hevs/ch/silab/hevs/ch/silab/AppTest.class deleted file mode 100644 index 7858188..0000000 Binary files a/structSimV1/target/test-classes/hevs/ch/silab/hevs/ch/silab/AppTest.class and /dev/null differ