Merge branch '364-cif-data-based-synthesis-performance-test-models-2' into 'develop'

CIF data-based synthesis performance test models: water_lock

See merge request !319

cif/org.eclipse.escet.cif.examples/benchmarks/festo/station5.cif

@@ -160,7 +160,7 @@ requirement ClampDrill:
   location Five:
     edge A_drilldown.c_off goto Six;
   location Six:
-    edge A_drillup.c_on goto seven;
+    edge A_drillup.c_on goto Seven;
   location Seven:
     edge A_drill.c_off goto Eight;
   location Eight:

cif/org.eclipse.escet.cif.examples/benchmarks/waterway_lock/_source.txt

+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2022 Contributors to the Eclipse Foundation
+//
+// See the NOTICE file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available
+// under the terms of the MIT License which is available at
+// https://opensource.org/licenses/MIT
+//
+// SPDX-License-Identifier: MIT
+//////////////////////////////////////////////////////////////////////////////
+
+Model source: Ferdie Reijnen, Martijn Goorden, Joanna van de Mortel-Fronczak and Jacobus Rooda, "Supervisory Control
+Synthesis for a Waterway Lock" In: Proceedings of the IEEE Conference on Control Technology and Applications, pages 
+1562-1568, 2017, doi: https://doi.org/10.1109/CCTA.2017.8062679.
+
+Model repository: https://github.com/ffhreijnen/LockCCTA.

cif/org.eclipse.escet.cif.examples/benchmarks/waterway_lock/synthesize.tooldef

+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2017, 2022 Contributors to the Eclipse Foundation
+//
+// See the NOTICE file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available
+// under the terms of the MIT License which is available at
+// https://opensource.org/licenses/MIT
+//
+// SPDX-License-Identifier: MIT
+//////////////////////////////////////////////////////////////////////////////
+
+// Synthesize the supervisor.
+
+from "lib:cif" import *;
+
+mkdir("generated", force=true);
+
+cifdatasynth("waterway_lock.cif -mdebug -o generated/waterway_lock.synthesized.cif");

cif/org.eclipse.escet.cif.examples/src/org/eclipse/escet/cif/examples/CifBenchmarksWizard.java

@@ -31,7 +31,8 @@ public class CifBenchmarksWizard extends CopyFilesNewProjectWizard {
     @Override
     protected Map<String, String> getPathsToCopy() {
         Map<String, String> entries = map();
-        entries.put("benchmarks/festo", "FESTO");
+        entries.put("benchmarks/festo", "festo");
+        entries.put("benchmarks/waterway_lock", "waterway_lock");
         return entries;
     }
 }