State Space Model _ non runnable

d3scomp · Jul 7, 2014 · 7ecbb0e · 7ecbb0e
1 parent 62efc9d
commit 7ecbb0e
Show file tree

Hide file tree

Showing 56 changed files with 4,431 additions and 3,274 deletions.
diff --git a/FireFighter_original.slx b/FireFighter_original.slx
diff --git a/jdeeco-core/.classpath b/jdeeco-core/.classpath
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="test">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="test">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="C:/Users/rima/Downloads/commons-math3-3.1.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/jdeeco-core/model/RuntimeModel.ecore b/jdeeco-core/model/RuntimeModel.ecore
@@ -50,11 +50,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="modeControllers" upperBound="-1"
         eType="#//ModeController" containment="true" eOpposite="#//ModeController/componentInstance"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="stateSpaceModels" upperBound="-1"
-        eType="#//StateSpaceModel" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="entry" eType="#//ComponentProcessEntry"
-        containment="true" eOpposite="#//ComponentProcessEntry/componentInstance"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="exit" eType="#//ComponentProcessExit"
-        containment="true" eOpposite="#//ComponentProcessExit/componentInstance"/>
+        eType="#//StateSpaceModelDefinition" containment="true" eOpposite="#//StateSpaceModelDefinition/componentInstance"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EnsembleDefinition">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -111,12 +107,20 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EDataType" name="CommunicationBoundary" instanceClassName="cz.cuni.mff.d3s.deeco.network.CommunicationBoundaryPredicate"/>
-  <eClassifiers xsi:type="ecore:EClass" name="StateSpaceModel">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inStates" lowerBound="1"
-        upperBound="-1" eType="#//KnowledgePath"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="derivationStates" upperBound="-1"
+  <eClassifiers xsi:type="ecore:EClass" name="StateSpaceModelDefinition" eSuperTypes="#//Invocable">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="triggerKowledgePath" lowerBound="1"
         eType="#//KnowledgePath"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="model" eType="#//ModelType"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="derivationStates" lowerBound="1"
+        upperBound="-1" eType="#//InaccurateValue"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" lowerBound="1"
+        eType="#//ComponentInstance" eOpposite="#//ComponentInstance/stateSpaceModels"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inStates" lowerBound="1"
+        upperBound="-1" eType="#//InaccurateValue"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="triggers" upperBound="-1"
+        eType="#//Trigger" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isActive" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ModeController">
     <eStructuralFeatures xsi:type="ecore:EReference" name="initMode" lowerBound="1"
@@ -135,35 +139,13 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="transitionCondition" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="meta" eType="#//MetadataType"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ModelType" instanceClassName="cz.cuni.mff.d3s.deeco.model.runtime.stateflow.Model"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentProcessEntry" eSuperTypes="#//Invocable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" eType="#//ComponentInstance"
-        eOpposite="#//ComponentInstance/entry"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="triggers" upperBound="-1"
-        eType="#//ActivateModeTrigger" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isActive" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentProcessExit" eSuperTypes="#//Invocable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" eType="#//ComponentInstance"
-        eOpposite="#//ComponentInstance/exit"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="triggers" upperBound="-1"
-        eType="#//DeactivateModeTrigger" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isActive" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ActivateModeTrigger" eSuperTypes="#//Trigger">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mode" eType="#//ComponentProcess"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeactivateModeTrigger" eSuperTypes="#//Trigger">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mode" eType="#//ComponentProcess"/>
-  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="ModelType" instanceClassName="cz.cuni.mff.d3s.deeco.model.runtime.stateflow.ModelInterface"/>
   <eClassifiers xsi:type="ecore:EEnum" name="MetadataType">
     <eLiterals name="EMPTY"/>
     <eLiterals name="TS" value="1"/>
     <eLiterals name="MIN_BOUNDARY" value="2"/>
     <eLiterals name="MAX_BOUNDARY" value="3"/>
     <eLiterals name="INACCURACY" value="4"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="InaccurateValue" instanceClassName="cz.cuni.mff.d3s.deeco.model.runtime.stateflow.InaccurateValueDefinition"/>
 </ecore:EPackage>