diff --git a/src/test/java/de/monticore/lang/monticar/generator/middleware/EvaluationTest.java b/src/test/java/de/monticore/lang/monticar/generator/middleware/EvaluationTest.java index f25f8810e56754c43d4203c0f42ee72d52d9d487..dbd26fbf029bb6014db7640499ed25f1ca7d781f 100644 --- a/src/test/java/de/monticore/lang/monticar/generator/middleware/EvaluationTest.java +++ b/src/test/java/de/monticore/lang/monticar/generator/middleware/EvaluationTest.java @@ -21,13 +21,7 @@ public class EvaluationTest { DistributedTargetGeneratorCli.main(new String[]{"./src/test/resources/config/evaluation/supermario.json"}); } - @Ignore("Spectral: isolated vertex") - @Test - public void testSimulatorModel() { - DistributedTargetGeneratorCli.main(new String[]{"./src/test/resources/config/evaluation/simulatormodel.json"}); - } - - @Ignore("Spectral: isolated vertex") + @Ignore("Very long runtime(30min+)") @Test public void testDaimlerModel() { DistributedTargetGeneratorCli.main(new String[]{"./src/test/resources/config/evaluation/daimler.json"}); diff --git a/src/test/resources/config/evaluation/daimler.json b/src/test/resources/config/evaluation/daimler.json index 7ca19511b1e8dcbfbbc1f33336fa7bee83277c5f..5e646d248b61064b0d325a0aebcda9d76a4b3e9f 100644 --- a/src/test/resources/config/evaluation/daimler.json +++ b/src/test/resources/config/evaluation/daimler.json @@ -13,11 +13,7 @@ }, { "name":"SpectralClustering", - "numberOfClusters":6 - }, - { - "name":"SpectralClustering", - "numberOfClusters":19 + "numberOfClusters":10 }, { "name":"Markov" diff --git a/src/test/resources/config/evaluation/simulatormodel.json b/src/test/resources/config/evaluation/simulatormodel.json deleted file mode 100644 index 1ea9aa3e67f3f0159abf6426efb3c2f68453635d..0000000000000000000000000000000000000000 --- a/src/test/resources/config/evaluation/simulatormodel.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "modelsDir": "src/test/resources/simulatorModel/", - "outputDir": "target/evaluation/simulatormodel/", - "rootModel": "simulatorModel.mainController", - "generators": ["cpp"], - "writeTagFile":true, - "clusteringParameters":{ - "flatten":true, - "algorithmParameters":[ - { - "name":"SpectralClustering", - "numberOfClusters":3 - }, { - "name":"Markov" - }, - { - "name":"AffinityPropagation" - } - ] - } -} \ No newline at end of file diff --git a/src/test/resources/simulatorModel/simulatorModel/MainController.emam b/src/test/resources/simulatorModel/simulatorModel/MainController.emam deleted file mode 100644 index 30f0198abcd33a65a6ce54f0ed04cd593b0ed93a..0000000000000000000000000000000000000000 --- a/src/test/resources/simulatorModel/simulatorModel/MainController.emam +++ /dev/null @@ -1,44 +0,0 @@ -package simulatorModel; - -import SteeringController; -import VelocityController; -import StatusController; - -component MainController{ - ports - in Q(0m:200m) fl, - in Q(0m:200m) fr, - in Q(0m:200m) slf, - in Q(0m:200m) slb, - in Q(0m:200m) srf, - in Q(0m:200m) srb, - - in Q(0s:oos) time, - in Q(0m/s:25m/s) velocity, - - in Q(-200m:200m) x, - in Q(-200m:200m) y, - - out Q(-2m/s^2:2m/s^2) acceleration, - out Q(-180:180) steering, - out B status; - - instance SteeringController steeringController; - instance VelocityController velocityController; - instance StatusController trigger; - - connect time->velocityController.time; - connect velocity->velocityController.velocity; - connect fl->steeringControllerler.fl; - connect fr->steeringController.fr; - connect slf->steeringController.slf; - connect slb->steeringController.slb; - connect srf->steeringController.srf; - connect srb->steeringController.srb; - connect x->trigger.x; - connect y->trigger.y; - connect time ->trigger.time; - - connect velocityController.acceleration->acceleration; - connect steeringController.steering->steering; -} \ No newline at end of file diff --git a/src/test/resources/simulatorModel/simulatorModel/StatusController.emam b/src/test/resources/simulatorModel/simulatorModel/StatusController.emam deleted file mode 100644 index 38ad311850cb0533b8a61c7442962d7522d49a28..0000000000000000000000000000000000000000 --- a/src/test/resources/simulatorModel/simulatorModel/StatusController.emam +++ /dev/null @@ -1,17 +0,0 @@ -package simulatorModel; - -component StatusController { - port - in Q(-200m:200m) x, - in Q(-200m:200m) y, - out B status; - - implementation Math{ - - // the track boundaries - B boundariesX = (x > 200m) || (x < -200m); - B boundariesY = (y > 120m) || (y < -50m); - - status = boundariesX || boundariesY; - } -} \ No newline at end of file diff --git a/src/test/resources/simulatorModel/simulatorModel/StatusControllerTets.stream b/src/test/resources/simulatorModel/simulatorModel/StatusControllerTets.stream deleted file mode 100644 index 3b0bef801733fa4fc7e8db5d8c63a70196e36b0a..0000000000000000000000000000000000000000 --- a/src/test/resources/simulatorModel/simulatorModel/StatusControllerTets.stream +++ /dev/null @@ -1,8 +0,0 @@ -package simulatorModel; - -stream StatusControllerTest for StatusController { - x: 0m tick 200m tick -200m tick 250m; - y: 0m tick 120m tick -50m tick 50m; - - status: false tick false tick false tick true; -} \ No newline at end of file diff --git a/src/test/resources/simulatorModel/simulatorModel/SteeringController.emam b/src/test/resources/simulatorModel/simulatorModel/SteeringController.emam deleted file mode 100644 index c413e074122867c3336545ff81a44a4e4f18fd66..0000000000000000000000000000000000000000 --- a/src/test/resources/simulatorModel/simulatorModel/SteeringController.emam +++ /dev/null @@ -1,39 +0,0 @@ -package simulatorModel; - -component SteeringController { - port - - in Q(0m:200m) fl, - in Q(0m:200m) fr, - in Q(0m:200m) slf, - in Q(0m:200m) slb, - in Q(0m:200m) srf, - in Q(0m:200m) srb, - in Q(0m:200m) br, - in Q(0m:200m) bl, - out Q(-180:180) steering; - - implementation Math{ - - Q(0m:1m) threshold = 0.1m; - Q(-1m:0m) thresholdN = -0.1m; - - B comp1 = (((fl-fr) > threshold) && ((slf-slb) > threshold)) && ((srb-srf) > threshold); - B comp2 = (((fl-fr) < thresholdN) && ((slf-slb) < thresholdN)) && ((srb-srf) < thresholdN); - B comp3 = (slf 10 m/s) - acceleration = 0m/s^2; - else - acceleration = 1m/s^2; - end - } -} \ No newline at end of file diff --git a/src/test/resources/simulatorModel/simulatorModel/VelocityControllerTest.stream b/src/test/resources/simulatorModel/simulatorModel/VelocityControllerTest.stream deleted file mode 100644 index 2bd364c3b7ad94193f9146c78a6536369fa994a8..0000000000000000000000000000000000000000 --- a/src/test/resources/simulatorModel/simulatorModel/VelocityControllerTest.stream +++ /dev/null @@ -1,8 +0,0 @@ -package simulatorModel; - -stream VelocityControllerTest for VelocityController { - velocity: 0m/s tick 10m/s tick 11m/s; - time: 0s tick 10s tick 11s; - - acceleration: 1m/s^2 tick 1m/s^2 tick 0m/s^2; -} \ No newline at end of file