fix merging issue

23 files changed, 594 insertions, 399 deletions

diff --git a/Metrics/Metrics-Calculation/.project b/Metrics/Metrics-Calculation/.project
new file mode 100644
index 00000000..8cdd9483
--- /dev/null
+++ b/Metrics/Metrics-Calculation/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+        <name>Metrics-Calculation</name>
+        <comment></comment>
+        <projects>
+        </projects>
+        <buildSpec>
+        </buildSpec>
+        <natures>
+        </natures>
+</projectDescription>
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/META-INF/MANIFEST.MF b/Metrics/Metrics-Calculation/SocialNetwork_plugin/META-INF/MANIFEST.MF
index 6317c9fb..833b6fd8 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/META-INF/MANIFEST.MF
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/META-INF/MANIFEST.MF
@@ -25,8 +25,8 @@ Require-Bundle: org.eclipse.viatra.query.runtime.rete,
  org.junit;bundle-version="4.12.0",
  org.eclipse.collections;bundle-version="9.2.0",
  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0",
- hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation;bundle-version="0.0.1",
- ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator;bundle-version="1.0.0"
+ ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation;bundle-version="0.0.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Main-Class: ca.mcgill.ecse.socialnetwork.runner.Main
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/Measurement_Runner_yakindu.launch b/Metrics/Metrics-Calculation/SocialNetwork_plugin/Measurement_Runner_yakindu.launch
new file mode 100644
index 00000000..c9301097
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/Measurement_Runner_yakindu.launch
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaAdvancedSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;hu.bme.mit.inf.dslreasoner.viatra2logic&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;directory nest=&amp;quot;false&amp;quot; path=&amp;quot;C:\Users\chenp\eclipse-workspace\VIATRA-Generator\Solvers\VIATRA-Solver\hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra\src\hu\bme\mit\inf\dslreasoner\viatrasolver&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;directory nest=&amp;quot;false&amp;quot; path=&amp;quot;C:\Users\chenp\eclipse-workspace\VIATRA-Generator\Solvers\VIATRA-Solver\hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra\src\hu\bme\mit\inf\dslreasoner\viatrasolver\logic2viatra&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;directory nest=&amp;quot;false&amp;quot; path=&amp;quot;C:\Users\chenp\eclipse-workspace\VIATRA-Generator\Solvers\VIATRA-Solver\hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra\src\hu\bme\mit\inf\dslreasoner\viatrasolver\logic2viatra\rules&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ca.mcgill.ecse.socialnetwork.runner.Main"/>
+<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="SocialNetwork_plugin"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="yakinduGeneration.vsconfig"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="SocialNetwork_plugin"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx8G&#13;&#10;-Djava.library.path=&quot;D:\Program Files\z3-4.8.8-x64-win\z3-4.8.8-x64-win\bin&quot;"/>
+</launchConfiguration>
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/.gitignore b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/.gitignore
deleted file mode 100644
index 25056e9e..00000000
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/ca/
-/queries/
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/.gitignore b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/.gitignore
new file mode 100644
index 00000000..f2558cf5
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/.gitignore
@@ -0,0 +1,10 @@
+/.Friendship.java._trace
+/.NoFriend.java._trace
+/.Queries.java._trace
+/.SelfFriend.java._trace
+/.SingleFriendship.java._trace
+/Friendship.java
+/NoFriend.java
+/Queries.java
+/SelfFriend.java
+/SingleFriendship.java
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/Queries.vql b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/Queries.vql
new file mode 100644
index 00000000..3e7fc68c
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/Queries.vql
@@ -0,0 +1,54 @@
+package ca.mcgill.ecse.socialnetwork.plugin
+
+import epackage "http://ecse.mcgill.ca/socialnetwork"
+
+//@Constraint(message="terminatorAndInformation", severity="error", key={T})
+//pattern terminatorAndInformation(T : FAMTerminator, I : InformationLink) = {
+//      FunctionalOutput.outgoingLinks(Out,I);
+//      FunctionalOutput.terminator(Out,T);
+//} or {
+//      InformationLink.to(I,In);
+//      FunctionalInput.terminator(In,T);
+//}
+
+@Constraint(message="singleFriendship", severity="error", key={p1})
+pattern singleFriendship(p1: Person) {
+        find friendship(p1, p);
+        neg find friendship(p, p1);
+}
+
+//@Constraint(message="cycle", severity="error", key={p})
+//pattern cycleInParenthood(p: Person) {
+//      find isAncestor(p, p);
+//}
+
+@Constraint(message="noFriend", severity="error", key={p})
+pattern noFriend(p: Person){
+        neg find friendship(p, _);
+}
+
+//@Constraint(message="brothhoodParent", severity="error", key={p1,p2})
+//pattern brothhoodParent(p1: Person, p2: Person){
+//      Person.parents(p1, parent1);
+//      Person.parents(p2, parent2);
+//      parent1 == parent2;
+//      find isAncestor(p1, p2);
+//}
+@Constraint(message="selfFriend", severity="error", key={p})
+pattern selfFriend(p: Person){
+        Person.friends(p,p);
+}
+
+pattern friendship(p1: Person, p2: Person){
+        Person.friends(p1,p2);
+}
+
+//pattern isAncestor(person : Person, ancestor : Person){
+//      Person.parents(person, ancestor);
+//} or {
+//      Person.parents(person, parent);
+//      find isAncestor(parent, ancestor);
+//}
+
+
+
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/.gitignore b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/.gitignore
new file mode 100644
index 00000000..e9d711d4
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/.gitignore
@@ -0,0 +1,9 @@
+/.Ecore_pattern.java._trace
+/.MoreThenFiveSuperTypes.java._trace
+/.DirectSupertype.java._trace
+/.Ecore.java._trace
+/.LoopInInheritence.java._trace
+/.NonSymmetricOpposite.java._trace
+/.Opposite.java._trace
+/.OppositeDifferentClass.java._trace
+/.SuperTypes.java._trace
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/Ecore.vql b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/Ecore.vql
new file mode 100644
index 00000000..9ddb64c9
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/Ecore.vql
@@ -0,0 +1,33 @@
+package queries
+
+import epackage "http://www.eclipse.org/emf/2002/Ecore"
+
+pattern directSupertype(a: EClass, b:EClass) {
+        EClass.eSuperTypes(a,b);
+}
+
+@Constraint(key={a}, severity="error", message="error")
+pattern loopInInheritence(a: EClass) {
+        find directSupertype+(a,a);
+}
+
+pattern opposite(a:EReference, b: EReference) {
+        EReference.eOpposite(a,b);
+}
+@Constraint(key={a}, severity="error", message="error")
+pattern oppositeDifferentClass(a:EReference) {
+        EReference.eOpposite(a,b);
+        EReference.eContainingClass(a,aContaining);
+        EReference.eType(b,bTarget);
+        aContaining != bTarget;
+}
+
+@Constraint(key={a}, severity="error", message="error")
+pattern nonSymmetricOpposite(a:EReference, b:EReference) {
+        find opposite(a,b);
+        neg find opposite(b,a);
+}
+
+pattern superTypes(c1:EClass, c2:EClass){
+        EClass.eSuperTypes(c1,c2);
+}
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/debug/errors.txt b/Metrics/Metrics-Calculation/SocialNetwork_plugin/debug/errors.txt
index 27d00bd9..cbbf6c0f 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/debug/errors.txt
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/debug/errors.txt
@@ -1,13 +1,14 @@
-Error occured (DiagnosticWrappedException): java.io.FileNotFoundException: C:\Users\chenp\eclipse-workspace\VIATRA-Generator\Metrics\Metrics-Calculation\SocialNetwork_plugin\inputs\github.xmi (The system cannot find the file specified)
-    org.eclipse.emf.ecore.resource.impl.ResourceSetImpl.handleDemandLoadException(ResourceSetImpl.java:319)
-    org.eclipse.emf.ecore.resource.impl.ResourceSetImpl.demandLoadHelper(ResourceSetImpl.java:278)
-    org.eclipse.xtext.resource.XtextResourceSet.getResource(XtextResourceSet.java:265)
-    org.eclipse.xtext.resource.SynchronizedXtextResourceSet.getResource(SynchronizedXtextResourceSet.java:25)
-    hu.bme.mit.inf.dslreasoner.application.execution.ModelLoader.loadModel(ModelLoader.java:41)
-    hu.bme.mit.inf.dslreasoner.application.execution.GenerationTaskExecutor.executeGenerationTask(GenerationTaskExecutor.java:174)
-    hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor._execute(ScriptExecutor.java:137)
-    hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor.execute(ScriptExecutor.java:346)
-    hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor.executeScript(ScriptExecutor.java:115)
-    hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor.executeScript(StandaloneScriptExecutor.java:149)
-    ca.mcgill.ecse.socialnetwork.runner.Main.runWithPath(Main.java:25)
-    ca.mcgill.ecse.socialnetwork.runner.Main.main(Main.java:38)
+Error occured (NullPointerException): 
+    hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner.lambda$23(ViatraReasoner.java:447)
+    org.eclipse.xtext.xbase.lib.ObjectExtensions.operator_doubleArrow(ObjectExtensions.java:140)
+    hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner.lambda$1(ViatraReasoner.java:451)
+    org.eclipse.xtext.xbase.lib.ObjectExtensions.operator_doubleArrow(ObjectExtensions.java:140)
+    hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner.solve(ViatraReasoner.java:531)
+    hu.bme.mit.inf.dslreasoner.application.execution.GenerationTaskExecutor.executeGenerationTask(GenerationTaskExecutor.java:329)
+    hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor._execute(ScriptExecutor.java:141)
+    hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor.execute(ScriptExecutor.java:382)
+    hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor.executeScript(ScriptExecutor.java:122)
+    hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor.executeScript(StandaloneScriptExecutor.java:155)
+    hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor.executeScript(StandaloneScriptExecutor.java:147)
+    ca.mcgill.ecse.socialnetwork.runner.Main.runWithPath(Main.java:24)
+    ca.mcgill.ecse.socialnetwork.runner.Main.main(Main.java:40)
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/ecore.vsconfig b/Metrics/Metrics-Calculation/SocialNetwork_plugin/ecore.vsconfig
index e63095e1..9d3dd0e9 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/ecore.vsconfig
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/ecore.vsconfig
@@ -30,18 +30,19 @@ generate {
         
         //median run time
         scope = {
-                #node = 10  // (warm-up: 10) 30, 50, 80, 100, 120 ....
+                #node = 30  // (warm-up: 10) 30, 50, 80, 100, 120 ....
         }
         
         number = 1
-        runs = 5
+        runs = 1
         config = {
                 log-level = none,
                 runtime = 300, // the runtime is in seconds, want to set is to 5 mins
                 "optional-wf" = "false",
                 "realistic-guidance" = "Composite",
                 "allow-must-violations" = "false",
-                "domain" = "Ecore"
+                "domain" = "Ecore",
+                "scopePropagator" = "typeHierarchy"
         }
         
         debug = "debug"
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/github.vsconfig b/Metrics/Metrics-Calculation/SocialNetwork_plugin/github.vsconfig
index 1e1ee05a..e9f9a8d5 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/github.vsconfig
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/github.vsconfig
@@ -12,7 +12,7 @@ generate {
         solver = ViatraSolver
         
         scope = {
-                #node = 10
+                #node = 30
         }
         
         number = 1
@@ -20,10 +20,11 @@ generate {
         config = {
                 log-level = none,
                 runtime = 300,
-                "optional-wf" = "true",
+                "optional-wf" = "false",
                 "realistic-guidance" = "Composite",
-                "allow-must-violations" = "true",
-                "domain" = "Github"
+                "allow-must-violations" = "false",
+                "domain" = "Github",
+                "scopePropagator" = "typeHierarchy"
         }
         
         debug = "debug"
@@ -31,182 +32,182 @@ generate {
         output = "output/Github/Composite"
 }
 
-generate {
-        metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
-                        Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
-                        IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
-        partial-model = { "inputs/github.xmi"}
-        constraints = { package queries }
+// generate {
+//      metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
+//                      Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
+//                      IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
+//      partial-model = { "inputs/github.xmi"}
+//      constraints = { package queries }
         
 
-        solver = ViatraSolver
-        
-        scope = {
-                #node = 30
-        }
-        
-        number = 1
-        runs = 20
-        config = {
-                log-level = none,
-                runtime = 300,
-                "optional-wf" = "true",
-                "realistic-guidance" = "Composite",
-                "allow-must-violations" = "true",
-                "domain" = "Github"
-        }
-        
-        debug = "debug"
-        statistics = "statistics/Github/30.csv"
-        output = "output/Github/Composite"
-}
+//      solver = ViatraSolver
+        
+//      scope = {
+//              #node = 30
+//      }
+        
+//      number = 1
+//      runs = 20
+//      config = {
+//              log-level = none,
+//              runtime = 300,
+//              "optional-wf" = "true",
+//              "realistic-guidance" = "Composite",
+//              "allow-must-violations" = "true",
+//              "domain" = "Github"
+//      }
+        
+//      debug = "debug"
+//      statistics = "statistics/Github/30.csv"
+//      output = "output/Github/Composite"
+// }
 
-generate {
-        metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
-                        Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
-                        IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
-        partial-model = { "inputs/github.xmi"}
-        constraints = { package queries }
+// generate {
+//      metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
+//                      Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
+//                      IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
+//      partial-model = { "inputs/github.xmi"}
+//      constraints = { package queries }
         
 
-        solver = ViatraSolver
-        
-        scope = {
-                #node = 50
-        }
-        
-        number = 1
-        runs = 20
-        config = {
-                log-level = none,
-                runtime = 300,
-                "optional-wf" = "true",
-                "realistic-guidance" = "Composite",
-                "allow-must-violations" = "true",
-                "domain" = "Github"
-        }
-        
-        debug = "debug"
-        statistics = "statistics/Github/50.csv"
-        output = "output/Github/Composite"
-}
+//      solver = ViatraSolver
+        
+//      scope = {
+//              #node = 50
+//      }
+        
+//      number = 1
+//      runs = 20
+//      config = {
+//              log-level = none,
+//              runtime = 300,
+//              "optional-wf" = "true",
+//              "realistic-guidance" = "Composite",
+//              "allow-must-violations" = "true",
+//              "domain" = "Github"
+//      }
+        
+//      debug = "debug"
+//      statistics = "statistics/Github/50.csv"
+//      output = "output/Github/Composite"
+// }
 
-generate {
-        metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
-                        Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
-                        IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
-        partial-model = { "inputs/github.xmi"}
-        constraints = { package queries }
+// generate {
+//      metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
+//                      Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
+//                      IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
+//      partial-model = { "inputs/github.xmi"}
+//      constraints = { package queries }
         
 
-        solver = ViatraSolver
-        
-        scope = {
-                #node = 80
-        }
-        
-        number = 1
-        runs = 20
-        config = {
-                log-level = none,
-                runtime = 300,
-                "optional-wf" = "true",
-                "realistic-guidance" = "Composite",
-                "allow-must-violations" = "true",
-                "domain" = "Github"
-        }
-        
-        debug = "debug"
-        statistics = "statistics/Github/80.csv"
-        output = "output/Github/Composite"
-}
+//      solver = ViatraSolver
+        
+//      scope = {
+//              #node = 80
+//      }
+        
+//      number = 1
+//      runs = 20
+//      config = {
+//              log-level = none,
+//              runtime = 300,
+//              "optional-wf" = "true",
+//              "realistic-guidance" = "Composite",
+//              "allow-must-violations" = "true",
+//              "domain" = "Github"
+//      }
+        
+//      debug = "debug"
+//      statistics = "statistics/Github/80.csv"
+//      output = "output/Github/Composite"
+// }
 
-generate {
-        metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
-                        Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
-                        IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
-        partial-model = { "inputs/github.xmi"}
-        constraints = { package queries }
+// generate {
+//      metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
+//                      Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
+//                      IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
+//      partial-model = { "inputs/github.xmi"}
+//      constraints = { package queries }
         
 
-        solver = ViatraSolver
-        
-        scope = {
-                #node = 100
-        }
-        
-        number = 1
-        runs = 20
-        config = {
-                log-level = none,
-                runtime = 300,
-                "optional-wf" = "true",
-                "realistic-guidance" = "Composite",
-                "allow-must-violations" = "true",
-                "domain" = "Github"
-        }
-        
-        debug = "debug"
-        statistics = "statistics/Github/100.csv"
-        output = "output/Github/Composite"
-}
+//      solver = ViatraSolver
+        
+//      scope = {
+//              #node = 100
+//      }
+        
+//      number = 1
+//      runs = 20
+//      config = {
+//              log-level = none,
+//              runtime = 300,
+//              "optional-wf" = "true",
+//              "realistic-guidance" = "Composite",
+//              "allow-must-violations" = "true",
+//              "domain" = "Github"
+//      }
+        
+//      debug = "debug"
+//      statistics = "statistics/Github/100.csv"
+//      output = "output/Github/Composite"
+// }
 
-generate {
-        metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
-                        Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
-                        IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
-        partial-model = { "inputs/github.xmi"}
-        constraints = { package queries }
+// generate {
+//      metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
+//                      Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
+//                      IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
+//      partial-model = { "inputs/github.xmi"}
+//      constraints = { package queries }
         
 
-        solver = ViatraSolver
-        
-        scope = {
-                #node = 120
-        }
-        
-        number = 1
-        runs = 20
-        config = {
-                log-level = none,
-                runtime = 300,
-                "optional-wf" = "true",
-                "realistic-guidance" = "Composite",
-                "allow-must-violations" = "true",
-                "domain" = "Github"
-        }
-        
-        debug = "debug"
-        statistics = "statistics/Github/120.csv"
-        output = "output/Github/Composite"
-}
+//      solver = ViatraSolver
+        
+//      scope = {
+//              #node = 120
+//      }
+        
+//      number = 1
+//      runs = 20
+//      config = {
+//              log-level = none,
+//              runtime = 300,
+//              "optional-wf" = "true",
+//              "realistic-guidance" = "Composite",
+//              "allow-must-violations" = "true",
+//              "domain" = "Github"
+//      }
+        
+//      debug = "debug"
+//      statistics = "statistics/Github/120.csv"
+//      output = "output/Github/Composite"
+// }
 
-generate {
-        metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
-                        Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
-                        IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
-        partial-model = { "inputs/github.xmi"}
-        constraints = { package queries }
+// generate {
+//      metamodel = {package github excluding{ Project.creatd_at, Project.updated_at, Project.url, User.name, User.url,
+//                      Commit.created_at, Commit.sha, Commit.parents_sha, Issue.created_at, Issue.url, PullRequest.url, IssueEvent.created_at, 
+//                      IssueEvent.actor_url, Action, IssueEvent.action, Project.deleted}}
+//      partial-model = { "inputs/github.xmi"}
+//      constraints = { package queries }
         
 
-        solver = ViatraSolver
-        
-        scope = {
-                #node = 140
-        }
-        
-        number = 1
-        runs = 20
-        config = {
-                log-level = none,
-                runtime = 300,
-                "optional-wf" = "true",
-                "realistic-guidance" = "Composite",
-                "allow-must-violations" = "true",
-                "domain" = "Github"
-        }
-        
-        debug = "debug"
-        statistics = "statistics/Github/140.csv"
-        output = "output/Github/Composite"
-}
\ No newline at end of file
+//      solver = ViatraSolver
+        
+//      scope = {
+//              #node = 140
+//      }
+        
+//      number = 1
+//      runs = 20
+//      config = {
+//              log-level = none,
+//              runtime = 300,
+//              "optional-wf" = "true",
+//              "realistic-guidance" = "Composite",
+//              "allow-must-violations" = "true",
+//              "domain" = "Github"
+//      }
+        
+//      debug = "debug"
+//      statistics = "statistics/Github/140.csv"
+//      output = "output/Github/Composite"
+// }
\ No newline at end of file
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/DirectSupertype.java b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/DirectSupertype.java
index 003dbe3f..a557d865 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/DirectSupertype.java
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/DirectSupertype.java
@@ -79,9 +79,20 @@ public final class DirectSupertype extends BaseGeneratedEMFQuerySpecification<Di
     
     @Override
     public Object get(final String parameterName) {
-      if ("a".equals(parameterName)) return this.fA;
-      if ("b".equals(parameterName)) return this.fB;
-      return null;
+      switch(parameterName) {
+          case "a": return this.fA;
+          case "b": return this.fB;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          case 1: return this.fB;
+          default: return null;
+      }
     }
     
     public EClass getA() {
@@ -611,9 +622,9 @@ public final class DirectSupertype extends BaseGeneratedEMFQuerySpecification<Di
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: queries.DirectSupertype (visibility: PUBLIC, simpleName: DirectSupertype, identifier: queries.DirectSupertype, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link DirectSupertype} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: queries.DirectSupertype (visibility: PUBLIC, simpleName: DirectSupertype, identifier: queries.DirectSupertype, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link DirectSupertype#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/LoopInInheritence.java b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/LoopInInheritence.java
index 18ef65f0..5212e3d2 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/LoopInInheritence.java
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/LoopInInheritence.java
@@ -79,8 +79,18 @@ public final class LoopInInheritence extends BaseGeneratedEMFQuerySpecification<
     
     @Override
     public Object get(final String parameterName) {
-      if ("a".equals(parameterName)) return this.fA;
-      return null;
+      switch(parameterName) {
+          case "a": return this.fA;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          default: return null;
+      }
     }
     
     public EClass getA() {
@@ -467,9 +477,9 @@ public final class LoopInInheritence extends BaseGeneratedEMFQuerySpecification<
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: queries.LoopInInheritence (visibility: PUBLIC, simpleName: LoopInInheritence, identifier: queries.LoopInInheritence, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link LoopInInheritence} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: queries.LoopInInheritence (visibility: PUBLIC, simpleName: LoopInInheritence, identifier: queries.LoopInInheritence, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link LoopInInheritence#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/NonSymmetricOpposite.java b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/NonSymmetricOpposite.java
index cecbe2d8..c98014f5 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/NonSymmetricOpposite.java
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/NonSymmetricOpposite.java
@@ -85,9 +85,20 @@ public final class NonSymmetricOpposite extends BaseGeneratedEMFQuerySpecificati
     
     @Override
     public Object get(final String parameterName) {
-      if ("a".equals(parameterName)) return this.fA;
-      if ("b".equals(parameterName)) return this.fB;
-      return null;
+      switch(parameterName) {
+          case "a": return this.fA;
+          case "b": return this.fB;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          case 1: return this.fB;
+          default: return null;
+      }
     }
     
     public EReference getA() {
@@ -619,9 +630,9 @@ public final class NonSymmetricOpposite extends BaseGeneratedEMFQuerySpecificati
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: queries.NonSymmetricOpposite (visibility: PUBLIC, simpleName: NonSymmetricOpposite, identifier: queries.NonSymmetricOpposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link NonSymmetricOpposite} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: queries.NonSymmetricOpposite (visibility: PUBLIC, simpleName: NonSymmetricOpposite, identifier: queries.NonSymmetricOpposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link NonSymmetricOpposite#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/Opposite.java b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/Opposite.java
index 8c501b8e..ab808e10 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/Opposite.java
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/Opposite.java
@@ -80,9 +80,20 @@ public final class Opposite extends BaseGeneratedEMFQuerySpecification<Opposite.
     
     @Override
     public Object get(final String parameterName) {
-      if ("a".equals(parameterName)) return this.fA;
-      if ("b".equals(parameterName)) return this.fB;
-      return null;
+      switch(parameterName) {
+          case "a": return this.fA;
+          case "b": return this.fB;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          case 1: return this.fB;
+          default: return null;
+      }
     }
     
     public EReference getA() {
@@ -612,9 +623,9 @@ public final class Opposite extends BaseGeneratedEMFQuerySpecification<Opposite.
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: queries.Opposite (visibility: PUBLIC, simpleName: Opposite, identifier: queries.Opposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link Opposite} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: queries.Opposite (visibility: PUBLIC, simpleName: Opposite, identifier: queries.Opposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link Opposite#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/OppositeDifferentClass.java b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/OppositeDifferentClass.java
index 05f3a312..ff46566d 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/OppositeDifferentClass.java
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/OppositeDifferentClass.java
@@ -84,8 +84,18 @@ public final class OppositeDifferentClass extends BaseGeneratedEMFQuerySpecifica
     
     @Override
     public Object get(final String parameterName) {
-      if ("a".equals(parameterName)) return this.fA;
-      return null;
+      switch(parameterName) {
+          case "a": return this.fA;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          default: return null;
+      }
     }
     
     public EReference getA() {
@@ -475,9 +485,9 @@ public final class OppositeDifferentClass extends BaseGeneratedEMFQuerySpecifica
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: queries.OppositeDifferentClass (visibility: PUBLIC, simpleName: OppositeDifferentClass, identifier: queries.OppositeDifferentClass, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link OppositeDifferentClass} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: queries.OppositeDifferentClass (visibility: PUBLIC, simpleName: OppositeDifferentClass, identifier: queries.OppositeDifferentClass, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link OppositeDifferentClass#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/SuperTypes.java b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/SuperTypes.java
index 823e55da..4bf7a455 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/SuperTypes.java
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src-gen/queries/SuperTypes.java
@@ -79,9 +79,20 @@ public final class SuperTypes extends BaseGeneratedEMFQuerySpecification<SuperTy
     
     @Override
     public Object get(final String parameterName) {
-      if ("c1".equals(parameterName)) return this.fC1;
-      if ("c2".equals(parameterName)) return this.fC2;
-      return null;
+      switch(parameterName) {
+          case "c1": return this.fC1;
+          case "c2": return this.fC2;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fC1;
+          case 1: return this.fC2;
+          default: return null;
+      }
     }
     
     public EClass getC1() {
@@ -611,9 +622,9 @@ public final class SuperTypes extends BaseGeneratedEMFQuerySpecification<SuperTy
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: queries.SuperTypes (visibility: PUBLIC, simpleName: SuperTypes, identifier: queries.SuperTypes, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link SuperTypes} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: queries.SuperTypes (visibility: PUBLIC, simpleName: SuperTypes, identifier: queries.SuperTypes, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link SuperTypes#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java
index 383852f1..e4e5b61f 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java
@@ -15,7 +15,6 @@ import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io.GraphReader;
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io.RepMetricsReader;
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MetricSampleGroup;
 import hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor;
-import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation.ViolationCheck;
 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage;
 import socialnetwork.Person;
 
@@ -34,10 +33,13 @@ public class Main {
         public static void main(String args[]) {
                 String ecoreFile = args[0];
                 System.out.println("Generation Started");
+                
+                System.out.println(System.getProperty("java.library.path"));
+                
                 long begin = System.currentTimeMillis();
                 String message = runWithPath(ecoreFile);
                 long elapsed = System.currentTimeMillis() - begin;
-
+                
                 if(message != null) {
                         System.out.println(message);
                         return;
@@ -62,87 +64,87 @@ public class Main {
                 System.out.println("Finished");
         }
 
-        public static void generateModel(int run) {
-                String filename = run+"_1.xmi";
-                //prepare initial info
-                ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
-                ArrayList<String> infoOutput = new ArrayList<String>();
-                infoOutput.add(run+ "");
-                infoOutput.addAll(calculateMetric(run));
-
-                YakinduumModel model = new YakinduumModel(fileReadFolder +"run" +run + "/" + filename);
-                int violationCount = ViolationCheck.calculateViolationCounts(model.yakinduum);
-                infoOutput.add(violationCount + "");
-
-                
-                
-                //save model to another directory
-                model.save(configFolder + run + ".xmi");
-                output.add(infoOutput);
-                CsvFileWriter.append(output, configFileName);
-        }
-        
-        public static void singleModelViolationMeasure(int run) {
-                String filename = run+"_1.xmi";
-                //prepare initial info
-                ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
-                ArrayList<String> infoOutput = new ArrayList<String>();
-                infoOutput.add(run+ "");
-
-                YakinduumModel model = new YakinduumModel(fileReadFolder+"/run"+run+"/"+ filename);
-                
-                //parse map of violation counts to two list and add them to the result list 
-                Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum);
-                ArrayList<String> counts = new ArrayList<String>();
-                ArrayList<String> violationNames = new ArrayList<String>(map.keySet());
-                for(int i = 0; i < violationNames.size(); i++) {
-                        String name = violationNames.get(i);
-                        int total = map.get(name);
-                        counts.add(total + "");
-                }
-                output.add(infoOutput);
-                output.add(violationNames);
-                output.add(counts);
-                
-                CsvFileWriter.append(output, configFileName);
-        }
-        
-        public static void aggregateViolationMeasure(int size) {
-                ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
-                ArrayList<String> counts = new ArrayList<String>();
-                ArrayList<String> violationNames = null;
-                for(int run = 1; run < size+1; run++) {
-                        String filename = run+"_1.xmi";
-                        YakinduumModel model = new YakinduumModel(fileReadFolder+"/run"+run+"/"+ filename);
-
-                        Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum);
-                        if(run == 1) {
-                                violationNames = new ArrayList<String>(map.keySet());
-                                for(int i = 0; i < violationNames.size(); i++) {
-                                        String name = violationNames.get(i);
-                                        int total = map.get(name);
-                                        counts.add(total + "");
-                                }
-                        }else {
-                                for(int i = 0; i < violationNames.size(); i++) {
-                                        int count = Integer.parseInt(counts.get(i));
-                                        String name = violationNames.get(i);
-                                        int total = count + map.get(name);
-                                        counts.set(i, total + "");
-                                }
-                        }
-                }
-                
-                for(int i = 0; i < counts.size(); i++) {
-                        double count = Integer.parseInt(counts.get(i)) / (double) size;
-                        counts.set(i, count + "");
-                }
-                
-                output.add(violationNames);
-                output.add(counts);
-                CsvFileWriter.write(output, aggregateViolationMeasureFileName);
-        }
-        
+//      public static void generateModel(int run) {
+//              String filename = run+"_1.xmi";
+//              //prepare initial info
+//              ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
+//              ArrayList<String> infoOutput = new ArrayList<String>();
+//              infoOutput.add(run+ "");
+//              infoOutput.addAll(calculateMetric(run));
+//
+//              YakinduumModel model = new YakinduumModel(fileReadFolder +"run" +run + "/" + filename);
+//              int violationCount = ViolationCheck.calculateViolationCounts(model.yakinduum);
+//              infoOutput.add(violationCount + "");
+//
+//              
+//              
+//              //save model to another directory
+//              model.save(configFolder + run + ".xmi");
+//              output.add(infoOutput);
+//              CsvFileWriter.append(output, configFileName);
+//      }
+//      
+//      public static void singleModelViolationMeasure(int run) {
+//              String filename = run+"_1.xmi";
+//              //prepare initial info
+//              ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
+//              ArrayList<String> infoOutput = new ArrayList<String>();
+//              infoOutput.add(run+ "");
+//
+//              YakinduumModel model = new YakinduumModel(fileReadFolder+"/run"+run+"/"+ filename);
+//              
+//              //parse map of violation counts to two list and add them to the result list 
+//              Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum);
+//              ArrayList<String> counts = new ArrayList<String>();
+//              ArrayList<String> violationNames = new ArrayList<String>(map.keySet());
+//              for(int i = 0; i < violationNames.size(); i++) {
+//                      String name = violationNames.get(i);
+//                      int total = map.get(name);
+//                      counts.add(total + "");
+//              }
+//              output.add(infoOutput);
+//              output.add(violationNames);
+//              output.add(counts);
+//              
+//              CsvFileWriter.append(output, configFileName);
+//      }
+//      
+//      public static void aggregateViolationMeasure(int size) {
+//              ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
+//              ArrayList<String> counts = new ArrayList<String>();
+//              ArrayList<String> violationNames = null;
+//              for(int run = 1; run < size+1; run++) {
+//                      String filename = run+"_1.xmi";
+//                      YakinduumModel model = new YakinduumModel(fileReadFolder+"/run"+run+"/"+ filename);
+//
+//                      Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum);
+//                      if(run == 1) {
+//                              violationNames = new ArrayList<String>(map.keySet());
+//                              for(int i = 0; i < violationNames.size(); i++) {
+//                                      String name = violationNames.get(i);
+//                                      int total = map.get(name);
+//                                      counts.add(total + "");
+//                              }
+//                      }else {
+//                              for(int i = 0; i < violationNames.size(); i++) {
+//                                      int count = Integer.parseInt(counts.get(i));
+//                                      String name = violationNames.get(i);
+//                                      int total = count + map.get(name);
+//                                      counts.set(i, total + "");
+//                              }
+//                      }
+//              }
+//              
+//              for(int i = 0; i < counts.size(); i++) {
+//                      double count = Integer.parseInt(counts.get(i)) / (double) size;
+//                      counts.set(i, count + "");
+//              }
+//              
+//              output.add(violationNames);
+//              output.add(counts);
+//              CsvFileWriter.write(output, aggregateViolationMeasureFileName);
+//      }
+//      
         public static ArrayList<String> calculateMetric(int run) {
                 //read model and metric
                 ArrayList<String> output = new ArrayList<String>();
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Ecore/warmup.csv b/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Ecore/warmup.csv
index ad791735..13617342 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Ecore/warmup.csv
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Ecore/warmup.csv
@@ -1,7 +1,3 @@
-Task,Run,Result,Domain to logic transformation time,Logic to solver transformation time,Solver time,Postprocessing time,_Solution0FoundAt,TransformationExecutionTime,TypeAnalysisTime,MetricCalculationTime,StateCoderTime,StateCoderFailCount,SolutionCopyTime
-1,1,ModelResultImpl,1470,4786,7771,66116800,3921,1682,480,154,550,0,3
-1,2,ModelResultImpl,1470,2113,8817,10699700,5927,1993,3,300,1326,0,1
-1,3,ModelResultImpl,1470,1856,6810,12033700,3907,1602,1,111,692,0,1
-1,4,ModelResultImpl,1470,2441,6387,8147100,3326,1412,2,100,427,0,1
-1,5,ModelResultImpl,1470,1705,6328,8393300,2039,1123,0,56,190,0,1
+Task,Run,Result,Domain to logic transformation time,Logic to solver transformation time,Solver time,Postprocessing time,Solution0FoundAt,ExplorationInitializationTime,TransformationExecutionTime,ScopePropagationTime,MustRelationPropagationTime,TypeAnalysisTime,StateCoderTime,StateCoderFailCount,SolutionCopyTime,States,ForwardTime,BacktrackingTime,GlobalConstraintEvaluationTime,FitnessCalculationTime,ActivationSelectionTime,Decisions,Transformations,ScopePropagations,ScopePropagationsSolverCalls
+1,1,ModelResultImpl,910,7801,7469,66,7546,765,258,95,0,228,1118,0,2,1495,2706,1379,10,0,1,0,1769,654,0
 
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Yakindu/140.csv b/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Yakindu/140.csv
index 2ea01c80..293f51a5 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Yakindu/140.csv
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Yakindu/140.csv
@@ -1,22 +1,22 @@
-Task,Run,Result,Domain to logic transformation time,Logic to solver transformation time,Solver time,Postprocessing time,_Solution0FoundAt,TransformationExecutionTime,TypeAnalysisTime,MetricCalculationTime,StateCoderTime,StateCoderFailCount,SolutionCopyTime
-2,1,ModelResultImpl,28,1125,232547,238441100,231464,32513,30,5381,174058,0,3
-2,2,ModelResultImpl,28,932,262316,161173500,261382,26096,0,5936,207379,0,1
-2,3,ModelResultImpl,28,1227,292535,143575400,291587,32776,0,5863,228470,0,1
-2,4,ModelResultImpl,28,1048,291142,138985400,290250,31729,1,6141,227996,0,1
-2,5,ModelResultImpl,28,962,226481,144946000,225670,28211,0,5305,172447,0,1
-2,6,ModelResultImpl,28,913,236598,135164100,235765,24945,0,5586,184729,0,1
-2,7,ModelResultImpl,28,885,234174,143088000,233346,27412,0,5184,182189,0,1
-2,8,ModelResultImpl,28,879,205042,135824000,204263,25417,0,4926,157017,0,1
-2,9,ModelResultImpl,28,975,237992,154320900,237160,26181,0,5287,185721,0,0
-2,10,ModelResultImpl,28,908,213258,140980300,212461,28371,0,5041,161035,0,1
-2,11,ModelResultImpl,28,868,220191,146847500,219407,29612,0,4923,167193,0,1
-2,12,ModelResultImpl,28,986,217681,137838200,216908,27339,0,4956,166377,0,1
-2,13,ModelResultImpl,28,930,228167,126599800,227404,30279,0,5075,174085,0,0
-2,14,ModelResultImpl,28,878,246742,128511700,245938,21629,0,5670,199512,0,0
-2,15,ModelResultImpl,28,903,212514,141892400,211665,31163,0,4913,158072,0,0
-2,16,ModelResultImpl,28,928,233910,127925600,233102,23749,0,5410,184087,0,0
-2,17,ModelResultImpl,28,901,248732,134197200,247867,25543,0,5436,198007,0,1
-2,18,ModelResultImpl,28,926,277407,128580900,276418,27387,0,5841,220797,0,1
-2,19,ModelResultImpl,28,1090,272687,171318300,271352,29653,0,5675,212248,0,1
-2,20,ModelResultImpl,28,971,259569,148475200,258629,28250,0,5574,204259,0,2
+Task,Run,Result,Domain to logic transformation time,Logic to solver transformation time,Solver time,Postprocessing time,Solution1FoundAt,ExplorationInitializationTime,TransformationExecutionTime,TypeAnalysisTime,StateCoderTime,StateCoderFailCount,SolutionCopyTime,ActivationSelectionTime,NumericalSolverSumTime,NumericalSolverProblemFormingTime,NumericalSolverSolvingTime,NumericalSolverInterpretingSolution,NumericalSolverCachingTime,NumericalSolverCallNumber,NumericalSolverCachedAnswerNumber
+2,1,ModelResultImpl,49,948,55965,249,54293,1336,6134,11,17708,0,3,2,0,0,0,0,0,0,0
+2,2,ModelResultImpl,49,638,65106,310,63703,837,7067,0,20870,0,3,2,0,0,0,0,0,0,0
+2,3,ModelResultImpl,49,1929,69666,268,67267,1926,7537,0,20708,0,1,0,0,0,0,0,0,0,0
+2,4,ModelResultImpl,49,617,67091,318,65452,1078,8304,0,18694,0,1,0,0,0,0,0,0,0,0
+2,5,ModelResultImpl,49,1068,75850,145,74083,1480,8386,0,19637,0,1,0,0,0,0,0,0,0,0
+2,6,ModelResultImpl,49,785,65738,301,63408,1430,7695,0,16497,0,3,0,0,0,0,0,0,0,0
+2,7,ModelResultImpl,49,1055,85078,387,82888,1365,9313,0,22220,0,1,0,0,0,0,0,0,0,0
+2,8,ModelResultImpl,49,1189,63131,136,61246,1586,7804,0,17380,0,2,1,0,0,0,0,0,0,0
+2,9,ModelResultImpl,49,530,60098,248,58756,657,6900,0,18737,0,2,0,0,0,0,0,0,0,0
+2,10,ModelResultImpl,49,706,58634,247,56728,1023,6237,0,18909,0,1,0,0,0,0,0,0,0,0
+2,11,ModelResultImpl,49,683,55087,174,53903,749,5838,0,17665,0,1,0,0,0,0,0,0,0,0
+2,12,ModelResultImpl,49,533,69793,206,68720,625,7827,0,22340,0,1,0,0,0,0,0,0,0,0
+2,13,ModelResultImpl,49,625,58198,256,56830,781,6177,0,20134,0,2,0,0,0,0,0,0,0,0
+2,14,ModelResultImpl,49,555,66046,250,64950,664,7385,0,15860,0,0,0,0,0,0,0,0,0,0
+2,15,ModelResultImpl,49,586,96452,367,92042,1007,12651,0,23019,0,6,0,0,0,0,0,0,0,0
+2,16,ModelResultImpl,49,1523,72460,210,70549,1181,9123,1,21222,0,2,0,0,0,0,0,0,0,0
+2,17,ModelResultImpl,49,734,74551,417,72763,842,8117,0,21326,0,3,0,0,0,0,0,0,0,0
+2,18,ModelResultImpl,49,1282,75020,208,72887,1459,8671,0,22596,0,3,1,0,0,0,0,0,0,0
+2,19,ModelResultImpl,49,871,70125,286,68362,947,8755,0,18829,0,1,0,0,0,0,0,0,0,0
+2,20,ModelResultImpl,49,633,65564,149,64398,816,7912,0,15815,0,0,0,0,0,0,0,0,0,0
 
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Yakindu/warmup.csv b/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Yakindu/warmup.csv
index 94da3ec9..e874d546 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Yakindu/warmup.csv
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/statistics/Yakindu/warmup.csv
@@ -1,7 +1,3 @@
-Task,Run,Result,Domain to logic transformation time,Logic to solver transformation time,Solver time,Postprocessing time,_Solution0FoundAt,TransformationExecutionTime,TypeAnalysisTime,MetricCalculationTime,StateCoderTime,StateCoderFailCount,SolutionCopyTime
-1,1,ModelResultImpl,494,2798,2766,45079800,1362,547,125,46,190,0,3
-1,2,ModelResultImpl,494,1544,1988,11110900,1033,357,0,30,249,0,1
-1,3,ModelResultImpl,494,1366,1867,7926900,1060,364,2,24,258,0,1
-1,4,ModelResultImpl,494,1233,1588,8919800,863,312,0,19,146,0,1
-1,5,ModelResultImpl,494,1253,1434,7416800,681,268,1,17,133,0,0
+Task,Run,Result,Domain to logic transformation time,Logic to solver transformation time,Solver time,Postprocessing time,Solution0FoundAt,ExplorationInitializationTime,TransformationExecutionTime,ScopePropagationTime,MustRelationPropagationTime,TypeAnalysisTime,StateCoderTime,StateCoderFailCount,SolutionCopyTime,States,ForwardTime,BacktrackingTime,GlobalConstraintEvaluationTime,FitnessCalculationTime,ActivationSelectionTime,Decisions,MetricCalculationTime,Transformations,ScopePropagations,ScopePropagationsSolverCalls
+1,1,ModelResultImpl,2352,10681,69124,604,69169,829,1295,348,0,1040,24989,0,6,15152,20133,10141,18,0,6,0,8446,15835,6904,0
 
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduGeneration.vsconfig b/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduGeneration.vsconfig
index 721d506a..618d7b48 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduGeneration.vsconfig
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduGeneration.vsconfig
@@ -3,23 +3,24 @@ import viatra	"../../../Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgrap
 
 generate {
         metamodel = { package yakindumm excluding { Synchronization}}
-        constraints = { package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu }
+    constraints = { package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu }
         partial-model = { "inputs/start.xmi"}
 
         solver = ViatraSolver
         
         scope = {
-                #node = 10
+                #node = 200
         }
         
         number = 1
-        runs = 5
+        runs = 1
         config = {
                 log-level = none,
                 "optional-wf" = "false",
                 "realistic-guidance" = "Composite",
                 "allow-must-violations" = "false",
-                "domain" = "Yakindumm"
+                "domain" = "Yakindumm",
+                "scopePropagator" = "typeHierarchy"
         }
         
         statistics = "statistics/Yakindu/warmup.csv"  //give different set up different filenames
@@ -27,80 +28,80 @@ generate {
         output = "output/Yakindu/run_time/"
 }
 
-generate {
-        metamodel = { package yakindumm excluding { Synchronization}}
-        constraints = { package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu }
-        partial-model = { "inputs/start.xmi"}
+// generate {
+//      metamodel = { package yakindumm excluding { Synchronization}}
+//      constraints = { package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu }
+//      partial-model = { "inputs/start.xmi"}
 
-        solver = ViatraSolver
+//      solver = ViatraSolver
         
-        scope = {
-                #node = 140
-        }
+//      scope = {
+//              #node = 140
+//      }
         
-        number = 1
-        runs = 20
-        config = {
-                log-level = none,
-                "optional-wf" = "false",
-                "realistic-guidance" = "Composite",
-                "allow-must-violations" = "false",
-                "domain" = "Yakindumm"
-        }
+//      number = 1
+//      runs = 20
+//      config = {
+//              log-level = none,
+//              "optional-wf" = "false",
+//              "realistic-guidance" = "Composite",
+//              "allow-must-violations" = "false",
+//              "domain" = "Yakindumm"
+//      }
         
-        statistics = "statistics/Yakindu/140.csv"  //give different set up different filenames
-        debug = "debug"
-        output = "output/Yakindu/run_time/"
-}
+//      statistics = "statistics/Yakindu/140.csv"  //give different set up different filenames
+//      debug = "debug"
+//      output = "output/Yakindu/run_time/"
+// }
 
-generate {
-        metamodel = { package yakindumm excluding { Synchronization}}
-        constraints = { package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu }
-        partial-model = { "inputs/start.xmi"}
+// generate {
+//      metamodel = { package yakindumm excluding { Synchronization}}
+//      constraints = { package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu }
+//      partial-model = { "inputs/start.xmi"}
 
-        solver = ViatraSolver
+//      solver = ViatraSolver
         
-        scope = {
-                #node = 160
-        }
+//      scope = {
+//              #node = 160
+//      }
         
-        number = 1
-        runs = 20
-        config = {
-                log-level = none,
-                "optional-wf" = "false",
-                "realistic-guidance" = "Composite",
-                "allow-must-violations" = "false",
-                "domain" = "Yakindumm"
-        }
+//      number = 1
+//      runs = 20
+//      config = {
+//              log-level = none,
+//              "optional-wf" = "false",
+//              "realistic-guidance" = "Composite",
+//              "allow-must-violations" = "false",
+//              "domain" = "Yakindumm"
+//      }
         
-        statistics = "statistics/Yakindu/160.csv"  //give different set up different filenames
-        debug = "debug"
-        output = "output/Yakindu/run_time/"
-}
+//      statistics = "statistics/Yakindu/160.csv"  //give different set up different filenames
+//      debug = "debug"
+//      output = "output/Yakindu/run_time/"
+// }
 
-generate {
-        metamodel = { package yakindumm excluding { Synchronization}}
-        constraints = { package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu }
-        partial-model = { "inputs/start.xmi"}
+// generate {
+//      metamodel = { package yakindumm excluding { Synchronization}}
+//      constraints = { package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu }
+//      partial-model = { "inputs/start.xmi"}
 
-        solver = ViatraSolver
+//      solver = ViatraSolver
         
-        scope = {
-                #node = 180
-        }
+//      scope = {
+//              #node = 180
+//      }
         
-        number = 1
-        runs = 20
-        config = {
-                log-level = none,
-                "optional-wf" = "false",
-                "realistic-guidance" = "Composite",
-                "allow-must-violations" = "false",
-                "domain" = "Yakindumm"
-        }
+//      number = 1
+//      runs = 20
+//      config = {
+//              log-level = none,
+//              "optional-wf" = "false",
+//              "realistic-guidance" = "Composite",
+//              "allow-must-violations" = "false",
+//              "domain" = "Yakindumm"
+//      }
         
-        statistics = "statistics/Yakindu/180.csv"  //give different set up different filenames
-        debug = "debug"
-        output = "output/Yakindu/run_time/"
-}
\ No newline at end of file
+//      statistics = "statistics/Yakindu/180.csv"  //give different set up different filenames
+//      debug = "debug"
+//      output = "output/Yakindu/run_time/"
+// }
\ No newline at end of file
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/META-INF/MANIFEST.MF b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/META-INF/MANIFEST.MF
index eacce276..7c4f553d 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/META-INF/MANIFEST.MF
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Require-Bundle: com.google.guava,
  org.eclipse.emf.ecore;bundle-version="2.17.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.15.0",
  hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
- hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0",
  hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
  org.eclipse.viatra.dse;bundle-version="0.21.2",
  org.eclipse.viatra.query.runtime.rete;bundle-version="2.1.2",
@@ -20,10 +19,12 @@ Require-Bundle: com.google.guava,
  org.eclipse.collections;bundle-version="9.2.0",
  org.eclipse.viatra.query.runtime.localsearch;bundle-version="2.1.2",
  org.apache.log4j;bundle-version="1.2.15",
+ hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0",
  github-graph;bundle-version="0.1.0"
 Export-Package: ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app,
  ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance,
  ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph,
  ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io,
  ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics,
- ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.predictor
+ ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.predictor,
+ ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.validation