Merge pull request #4 from sesame-project/revert-2-nishadesai-patch-1

Revert "update the release workflow"

Author: jrharbin-york

.github/workflows/standalone-generator-release.yml

@@ -247,8 +247,8 @@
           eType="#//MRSPackage/Variable"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="valueIfNotReceived" eType="#//Metrics/MetricDefault"
           containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="initValue" eType="#//Metrics/MetricDefault"
-          containment="true"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="initValue" lowerBound="1"
+          eType="#//Metrics/MetricDefault" containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="useInOptimisation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="MetricDefault">

run_standalone_generator.sh

@@ -319,7 +319,7 @@ abstract class Metric {
 	// this is then applied for the optimisation algorithm
 	val MetricDefault[0..1] valueIfNotReceived;	
 	// initValue is used as an intialisation value in computing the conditions
-	val MetricDefault[0..1] initValue;
+	val MetricDefault[1] initValue;
 	attr boolean useInOptimisation;
 }
 

run_standalone_generator_params.sh

@@ -1,7 +1,6 @@
 package main;
 
 import uk.ac.york.sesame.testing.evolutionary.EvolutionaryExpt;
-import org.eclipse.epsilon.eol.exceptions.models.EolModelLoadingException;
 
 public class ExptRunner_[%= campaign.name %] {
 	public static void main(String [] args) {
@@ -21,6 +20,10 @@ public class ExptRunner_[%= campaign.name %] {
 		//ExperimentType etype = ExperimentType.FIXED_TIME_FUZZING;
 		// Sets the space model file and the campaign to run here 
 
+		// Setting paths
+		// The paths are now supplied from the Wizard - nothing needs to be configured here!
+		// IProjectPath = [%= path %]
+
 		final String spaceModelFileName = "[%= testingModelPath %]";
 		final String CODE_GENERATION_DIRECTORY = "[%= codeGenerationDirectory %]";
 		final String orchestratorBasePath = "[%= orchestratorBasePath %]";
@@ -35,7 +38,8 @@ public class ExptRunner_[%= campaign.name %] {
 		[% if (campaign.activationGeneration.isTypeOf(TimeBasedActivationGenerationMethod)) { %]
 		final boolean conditionBased = false;
 		final int conditionDepth = 0;
-		[% } %]
+		
+		[% } %] 	 	
 
 		final String grammarPath = "[%= codeGenerationDirectory %]/grammar/sesame-standardgrammar-[%= campaign.name %].bnf";
 		EvolutionaryExpt jmetalExpt;

uk.ac.york.sesame.testing.dsl/models/TestingMM.ecore

@@ -1,4 +1,4 @@
-package metrics.generated;
+package metrics.template;
 
 import org.apache.flink.api.common.state.*;
 import org.apache.flink.configuration.Configuration;

uk.ac.york.sesame.testing.dsl/models/TestingMM.emf

@@ -1,4 +1,4 @@
-package metrics.generated;
+package metrics.template;
 
 import org.apache.flink.api.common.state.*;
 import org.apache.flink.configuration.Configuration;

uk.ac.york.sesame.testing.generator/files/exptrunner/exptrunner.egl

@@ -1,17 +1,18 @@
 rule metricAsMultiStream transform metric: Testing!StreamMetric {
 	guard : metric.streams.size() == 2
 	template : "metrics/multiStream.egl"
-	target : "src/metrics/generated/" + metric.name + "Metric.java"
+	target : "src/metrics/template/" + metric.name + "Metric.java"
 }
 
 rule metricAsSingleStream transform metric: Testing!StreamMetric {
 	guard : metric.streams.size() == 1
 	template : "metrics/singleStream.egl"
-	target : "src/metrics/generated/" + metric.name + "Metric.java"
+	target : "src/metrics/template/" + metric.name + "Metric.java"
 }
 
 rule generateRunners transform campaign: Testing!TestCampaign {
 	parameters : Map {
+		"path" = path,
 		"testingModelPath" = testingModelPath,
 		"codeGenerationDirectory" = codeGenerationDirectory,
 		"orchestratorBasePath" = orchestratorBasePath