Merge pull request #3 from Cambio-Project/WIPRework

Rework of everthing and temporal data.

TLTeaInterprtationClasses.drawio

@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2022-05-03T17:44:44.608Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/16.5.1 Chrome/96.0.4664.110 Electron/16.0.7 Safari/537.36" etag="sxUaetEWCDtRIsZZVHQp" version="16.5.1" type="device"><diagram id="XvbP_-tLDUmN1dMytv5E" name="Classes">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</diagram></mxfile>

diagrams.drawio

@@ -1 +1 @@
-<mxfile host="Electron" modified="2021-12-03T10:26:28.467Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/12.4.2 Chrome/78.0.3904.130 Electron/7.1.4 Safari/537.36" etag="FzLGjeoiKiKpmbXO7HeD" version="12.4.2" type="device" pages="1"><diagram id="KnvtDekhdVvnvpIvdUIZ" name="Page-1">7Vpbc9o6EP41PML4Jl8ek5D0tE17mMJM2qczKlZArW1RIQfIrz8SlsGyTHBcgt2keSDe1f3bTyvt2j37Kl6/o3Ax/0RCFPUsI1z37GHPsixgu/yf0GwyjRv4mWJGcZipzL1ijB+RVBpSm+IQLZWKjJCI4YWqnJIkQVOm6CClZKVWuyeROuoCzpCmGE9hpGvvcMjmUmu6wb7gH4Rnczm0b3lZQQzzynIlyzkMyaqgsq979hUlhGVP8foKRQK8HJes3c2B0t3EKEpYnQb/ffzw6+b6B3x0vxijf610uAnjvuzlAUapXPDklss3hMZpBOXE2SZHg5I0CZHo0OjZl6s5Zmi8gFNRuuL257o5iyMumfxRn2A+GqIMrQsqOeF3iMSI0Q2vIkttid0mh13Kq4IpcnznBSu4Ugel9We7nvcA8QeJ0TPwsqrx4uSPY0i7hpdttI2XU4FXf4J0Zok1Yr7tLiI8S7iKEYEOlFKE7vlML5ccO5zMJqJs6O8Vt9viobXXfJFrM7e6OVyIYabpdyTEzMmYwiQhptxrYCIGWZJUgHR5TxI2ljNzTm4ijdNehY38ChvtDHdyIwHNSBfjSetcdrwSUHbbZHZ1MpOfKOlPKEKdg8tuHS5fg+t9whBdUMR/364DcIMSr6ucNDirAwg0S33CYxy/XRsFlmojy2/dSZv6Ve36QazQMsaMplOW0vadkGcA1Qm1fmEz9RubhhJKwgsRKgj2RXC5xFMVGLTG7Gvh+ZvAcwCkNFxLeLfCJhcSPvuvReFbUdg2csFOFM0EoaQ8QhTHWzeZtTloGr4d6BQ9tf6sHoN0htjxixoKlXBIN3TBkFU+KtdRFEGGH9Qgqsq4coQRwVsq5yxzD1yS8i6ydctWxaCn1NEujtz0qvdnBozW0ZZru2X/Bv3st00/63XQDzSln1M6RxxwXvrp8Vdj+hlF+hXJB4DGPi6UOXSAkQOgcNJQKPl73HNqcg+8Tu4Bo9RR+Yx9ae7pYeVf7h0IKTvCPad87bVL7qo296wj5/dLc08P1Tt77IIXOHZBTfr5r5N+jt8y/fTUx7Pp19z4fk3j5xFlR6zvlw4+LSasa/1ygsUC57105Sw+t/NpzhizbpQYdIsxx27XdRkTaB35A9M6M2v0/I5Mwhndy/MEQM3zdODF3AnzPH1jYJiesvM8gcZTB3/FrbP5fgxqbkerWx48cF2FFY7hNtyP5RT5mbM29ik8eH4VFGyybTXwsI5FHqdOw/yZDj7w3IHhBfs/lV5mQ3qZBlD55Rgvxq97r//xLvp1+/gBvTe/08/p4uey4quL0XjUv8OPkIYa0d7MSxd+cVLNctaXLpWGOuGh8pwURsN0ReND6CmSHg8jOuUy/sTUbSX8euZ2iPvjhfi87q+DyG1ite4hWkpydsJD1E1ydstD9MuvBJtGjc4RT9PYQXBx/1loVn3/ca19/T8=</diagram></mxfile>
+<mxfile host="Electron" modified="2022-02-04T10:25:58.911Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/12.4.2 Chrome/78.0.3904.130 Electron/7.1.4 Safari/537.36" etag="7EYv9k6-IJ_ZarlLMUIV" version="12.4.2" type="device" pages="1"><diagram id="KnvtDekhdVvnvpIvdUIZ" name="Page-1">7Vpbc9o6EP41PMLY8v0xCUlP27SHKcykfTqjYgXU2hYVcoD8+iNhGSzLBMcl2E2aB+Jd3b/9tNKu3bOu4vU7ChfzTyREUQ8Y4bpnDXsAAMs2+D+h2WSawHczxYziMFOZe8UYPyKplO1mKQ7RUqnICIkYXqjKKUkSNGWKDlJKVmq1exKpoy7gDGmK8RRGuvYOh2wutaYb7Av+QXg2l0P7wMsKYphXlitZzmFIVgWVdd2zrighLHuK11coEuDluGTtbg6U7iZGUcLqNPjv44dfN9c/4KP7xRj9C9LhJoz7spcHGKVywZNbLt8QGqcRlBNnmxwNStIkRKJDo2ddruaYofECTkXpituf6+Ysjrhk8kd9gvloiDK0LqjkhN8hEiNGN7yKLLUkdpscdimvCqbI8Z0XrOBKHZTWn+163gPEHyRGz8ALVOPFyR/HkHYNL8toGy+7Aq/+BOnMEmvEfNtdRHiWcBUjAh0opQjd85leLjl2OJlNRNnQ3ytut8VDsNd8kWszt7o5XIhhpul3JMTMyZjCJCGm3GtgIgZZklSAdHlPEjaWM7NPbiKN016FjfwKG+0Md3IjOZqRLsaT1rlseyWgrLbJ7OpkJj9R0p9QhDoHl9U6XL4G1/uEIbqgiP++XQfgBiVeVzlp56wOINAs9QmPcfx2bRQA1UbAb91Jm/pV7fpBrBAYY0bTKUtp+07IMxzVCbV+YTP1G5uGEkrCCxEqCPZFcLnEUxUYtMbsa+H5m8Bz4EhpuJbwboVNLiR89l+LwreisG3kOjtRNBOEkvIIURxv3WTW5qBp+HagU/TU+rN6DNIZYscvaihUwiHd0AVDVvmoXEdRBBl+UIOoKuPKEUYEb6mcs8w9cEnKu8jWLVsVg55SR7s4ctOr3p8ZMFpHW67tlv0b9LPeNv3A66Cf05R+dukcsZ3z0k+PvxrTzyjSr0g+x9HYx4Uyhw4wcuAonDQUSv4e9+ya3HNeJ/cco9RR+Yx9ae7pYeVf7h0IKTvCPbt87bVK7qo298CR8/uluaeH6p09dp0XOHadmvTzXyf9bL9l+umpj2fTr7nx/ZrGzyPKjljfLx18WkxY1/rlBAtwznvpyll8bufTnDFm3Sgx6BZjjt2u6zIm0DryByY4M2v0/I5Mwhndy/MEjprn6cCLuRPmefrGwDA9Zed5Ao2nDv6KW2fz/RjU3I6gWx48cF2FFbbhNtyP5RT5mbM21ik8eH4VFGyyLDXwAMcij1OnYf5MBx947sDwgv2fSi+zIb1Mw1H5ZRsvxq97r//xLvp1+/gBvTe/08/p4uey4quL0XjUv8OPkIYa0d7MSxd+cVLNctaXLpWGOuGh8pwURsN0ReND6CmSHg8jOuUy/sTUbSX8euZ2iPvjhfi87q+DyG0CWvcQLSU5O+Eh6iY5u+Uh+uVXgk2jRvuIp2nsILi4/yw0q77/uNa6/h8=</diagram></mxfile>

interpreter/src/main/java/cambio/tltea/interpreter/BehaviorInterpretationResult.kt

@@ -0,0 +1,42 @@
+package cambio.tltea.interpreter
+
+import cambio.tltea.interpreter.nodes.ConsequenceDescription
+import cambio.tltea.interpreter.nodes.ISubscribableTriggerNotifier
+import cambio.tltea.interpreter.nodes.TriggerManager
+import cambio.tltea.interpreter.nodes.consequence.ActivationData
+import cambio.tltea.parser.core.ASTNode
+import java.util.function.Consumer
+
+/**
+ * @author Lion Wagner
+ */
+class BehaviorInterpretationResult internal constructor(
+    val modifiedAST: ASTNode,
+    val consequenceDescription: ConsequenceDescription,
+    val triggerManager: TriggerManager = consequenceDescription.triggerManager
+) :
+    ISubscribableTriggerNotifier {
+
+
+    fun activateProcessing() {
+        consequenceDescription.activateConsequence()
+    }
+
+    // ----- delegating the subscriptions to the trigger manager-----
+    override fun subscribeEventListener(listener: Consumer<ActivationData<*>>) {
+        consequenceDescription.triggerManager.subscribeEventListener(listener)
+    }
+
+    override fun <T : ActivationData<*>> subscribeEventListenerWithFilter(
+        listener: Consumer<T>,
+        filter: Class<T>
+    ) {
+        consequenceDescription.triggerManager.subscribeEventListenerWithFilter(listener, filter)
+    }
+
+    override fun unsubscribe(listener: Consumer<ActivationData<*>>) {
+        consequenceDescription.triggerManager.unsubscribe(listener)
+    }
+    //---------------------------------------------------------------
+
+}

interpreter/src/main/java/cambio/tltea/interpreter/Interpreter.kt

@@ -0,0 +1,15 @@
+package cambio.tltea.interpreter
+
+import cambio.tltea.interpreter.nodes.ConsequenceInterpreter
+import cambio.tltea.parser.core.ASTNode
+
+/**
+ * @author Lion Wagner
+ */
+object Interpreter {
+    fun interpretAsBehavior(root: ASTNode): BehaviorInterpretationResult {
+        val clone = root.clone()
+        val consequenceDescription = ConsequenceInterpreter().interpretAsMTL(clone)
+        return BehaviorInterpretationResult(clone, consequenceDescription)
+    }
+}