diff --git a/src/main/scala/org/rosi_project/example/ExampleAml.scala b/src/main/scala/org/rosi_project/example/ExampleAml.scala index 38f54195086aaea05ef6b17539650725f9bf0305..a2abfc6e086496ada990ac53d7cd9fc72b813c02 100644 --- a/src/main/scala/org/rosi_project/example/ExampleAml.scala +++ b/src/main/scala/org/rosi_project/example/ExampleAml.scala @@ -14,7 +14,7 @@ object ExampleAml extends App { //Prototypes val sucStack = amlView.createSystemUnitClass("Stack", "9") val sucCrane = amlView.createSystemUnitClass("Crane", "10") - val sucRamp = amlView.createSystemUnitClass("Rampe", "11") + val sucRamp = amlView.createSystemUnitClass("Ramp", "11") //System model val ihPpu = amlView.createInstanceHierarchy("PPU", "1") @@ -38,9 +38,7 @@ object ExampleAml extends App { ieStack1.setBaseSystemUnit(sucStack) ieCrane2.setBaseSystemUnit(sucCrane) ieRamp3.setBaseSystemUnit(sucRamp) - - //ModelElementLists.printAll() - + //val ieSensor2 = amlView.createInternalElement("Sensor2", "12") //ieStack1.addInternalElements(ieSensor2) @@ -77,7 +75,7 @@ object ExampleAml extends App { def query1(): Unit = { //Query Objects val q1 = new RsumQuery("Q1") - val co = new HelperCAEXObject("", "") //laufe über alle naturals im RSUM und suche, die die davon instanzen sind + val co = new HelperCAEXObject("", "") //run over all naturals in the RSUM and search the instances //Query Roles & Settings val r0 = q1.addQueryRole(co) @@ -154,7 +152,7 @@ object ExampleAml extends App { def query4(): Unit = { //Query Objects val q4 = new RsumQuery("Q4") - val ih = new InstanceHierarchy("PPU","") //wie kann ich auf die eigenschaften und werte prüfen + val ih = new InstanceHierarchy("PPU","") //how can I proof the properties and values val ie1 = new InternalElement("", "") val ie2 = new InternalElement("", "") val ihRie = new InstanceHierarchyInternalElementsInternalElement(ih, ie1) @@ -185,7 +183,7 @@ object ExampleAml extends App { def query5(): Unit = { //Query Objects val q5 = new RsumQuery("Q5") - val ih = new InstanceHierarchy("PPU","") //wie kann ich auf die eigenschaften und werte prüfen + val ih = new InstanceHierarchy("PPU","") //how can I proof the properties and values val ie1 = new InternalElement("", "") val ie2 = new InternalElement("", "") val ihRie = new InstanceHierarchyInternalElementsInternalElement(ih, ie1) @@ -292,7 +290,7 @@ object ExampleAml extends App { println(q.getQuery()) println(q.getQuery().runQuery()) - println("+++++++++++ MJ ++++++++++++++++++++++") + println("+++++++++++ MJ 1 ++++++++++++++++++++++") q.getQuery().generateModelJoinFromQuery("Query1") } @@ -313,7 +311,7 @@ object ExampleAml extends App { println(q.getQuery()) println(q.getQuery().runQuery()) - println("+++++++++++ MJ ++++++++++++++++++++++") + println("+++++++++++ MJ 2 ++++++++++++++++++++++") q.getQuery().generateModelJoinFromQuery("Query2") } @@ -333,7 +331,7 @@ object ExampleAml extends App { println(q.getQuery()) println(q.getQuery().runQuery()) - println("+++++++++++ MJ ++++++++++++++++++++++") + println("+++++++++++ MJ 3 ++++++++++++++++++++++") q.getQuery().generateModelJoinFromQuery("Query3") } @@ -356,7 +354,7 @@ object ExampleAml extends App { println(q.getQuery()) println(q.getQuery().runQuery()) - println("+++++++++++ MJ ++++++++++++++++++++++") + println("+++++++++++ MJ 4 ++++++++++++++++++++++") q.getQuery().generateModelJoinFromQuery("Query4") } @@ -380,7 +378,7 @@ object ExampleAml extends App { println(q.getQuery()) println(q.getQuery().runQuery()) - println("+++++++++++ MJ ++++++++++++++++++++++") + println("+++++++++++ MJ 5 ++++++++++++++++++++++") q.getQuery().generateModelJoinFromQuery("Query5") } @@ -398,7 +396,7 @@ object ExampleAml extends App { println(q.getQuery()) println(q.getQuery().runQuery()) - println("+++++++++++ MJ ++++++++++++++++++++++") + println("+++++++++++ MJ + ++++++++++++++++++++++") q.getQuery().generateModelJoinFromQuery("Query6") } @@ -412,13 +410,13 @@ object ExampleAml extends App { //Settings ie.getQueryObject.label = "IE" suc.getQueryObject.label = "SUC" - suc.setNameView("Stack", CheckingOption.equalsCheck) + suc.setNameView("Ramp", CheckingOption.equalsCheck) //suc.getQueryObject().addAttributeFilter("name", "Stack", CheckingOption.equalsCheck) - suc.getQueryObject.returned = false + //suc.getQueryObject.returned = false println(q.getQuery()) println(q.getQuery().runQuery()) - println("+++++++++++ MJ ++++++++++++++++++++++") + println("+++++++++++ MJ 7 ++++++++++++++++++++++") q.getQuery().generateModelJoinFromQuery("Query7") } @@ -437,7 +435,7 @@ object ExampleAml extends App { println(q.getQuery()) println(q.getQuery().runQuery()) - println("+++++++++++ MJ ++++++++++++++++++++++") + println("+++++++++++ MJ 8 ++++++++++++++++++++++") q.getQuery().generateModelJoinFromQuery("Query8") } diff --git a/src/main/scala/org/rosi_project/model_management/sum/query/RsumQuery.scala b/src/main/scala/org/rosi_project/model_management/sum/query/RsumQuery.scala index 487b2eb94a7104f6e0493a928e9d87dd3bd05470..e83687803d4bdc05888600479c07e81d37736b8f 100644 --- a/src/main/scala/org/rosi_project/model_management/sum/query/RsumQuery.scala +++ b/src/main/scala/org/rosi_project/model_management/sum/query/RsumQuery.scala @@ -56,7 +56,7 @@ class RsumQuery(_name: String) extends Query(_name) { var relHelper: Set[ModelJoinContainer] = Set.empty var relNames: Set[String] = Set.empty - queryRelRoles.filter(r => r.isReturned() && !r.isNegated).foreach(q => { + queryRelRoles.filter(r => r.isReturned && !r.isNegated).foreach(q => { val playerStart: Object = q.player.right.get val playerSource: Object = q.source.player.right.get val playerTarget: Object = q.target.player.right.get @@ -135,16 +135,15 @@ class RsumQuery(_name: String) extends Query(_name) { val playerStart: Object = q.player.right.get var clsName = playerStart.getClass.getName if (playerStart.isInstanceOf[QueryHelper]) { - clsName = playerStart.getClass.getSuperclass.getName + clsName = playerStart.getClass.getSuperclass.getName } println("-" + clsName) val nj = creator.createNaturalJoin(clsName) - playerStart.getClass.getMethods.filter(m => m.getParameterCount == 0 && m.getDeclaringClass.getName != "java.lang.Object") - .foreach(m => { - if (m.getName != "toString" && !m.getName.startsWith("get")) { - creator.createAttribute(nj, clsName, m.getName) - } - }) + playerStart.getClass.getMethods.filter(m => m.getParameterCount == 0 && m.getDeclaringClass.getName != "java.lang.Object" + && m.getName != "toString" && !m.getName.startsWith("get")).foreach(m => { + println(nj + " " + clsName + " " + m.getName) + creator.createAttribute(nj, clsName, m.getName) + }) creator.createFile(creator.done(nj), fileName + ".modeljoin") }) }