Optimizing generator with linear objective functions

author: Kristóf Marussy <marussy@mit.bme.hu> 2020-11-02 02:02:40 +0100
committer: Kristóf Marussy <marussy@mit.bme.hu> 2020-11-02 02:02:40 +0100
commit: f06427cd7375551582461f91b3458339a8227f9b (patch)
tree: 97bc6ec85f4c384e5080a6611b492caf460b6ce9 /Tests
parent: Must unit propagation (diff)
download: VIATRA-Generator-f06427cd7375551582461f91b3458339a8227f9b.tar.gz
VIATRA-Generator-f06427cd7375551582461f91b3458339a8227f9b.tar.zst
VIATRA-Generator-f06427cd7375551582461f91b3458339a8227f9b.zip
7 files changed, 13 insertions, 4 deletions
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore
new file mode 100644
index 00000000..7050a7e3
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore
@@ -0,0 +1 @@
+/queries/
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
index 3b9ccef7..19bc3cc8 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
@@ -7,3 +7,7 @@
 /.MemberHasParent.java._trace
 /.TwoMembersHaveNoParent.java._trace
 /.NegativeAge.java._trace
+/MemberHasParent.java
+/NegativeAge.java
+/ParentTooYoung.java
+/TwoMembersHaveNoParent.java
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore
index 3b9ccef7..19bc3cc8 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore
@@ -7,3 +7,7 @@
 /.MemberHasParent.java._trace
 /.TwoMembersHaveNoParent.java._trace
 /.NegativeAge.java._trace
+/MemberHasParent.java
+/NegativeAge.java
+/ParentTooYoung.java
+/TwoMembersHaveNoParent.java
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin
index 5c5071cc..23513b51 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin
Binary files differ
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
index f4f36951..9cc6e415 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
@@ -1,10 +1,10 @@
 package hu.bme.mit.inf.dslreasoner.run
-import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint
-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod
 import org.eclipse.viatra.dse.base.ThreadContext
+import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
 class FileSystemInconsistencyDetector extends ModelGenerationMethodBasedGlobalConstraint {
        var PartialInterpretation partialInterpretation
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
index bf9ca274..cbc692b3 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
@@ -12,8 +12,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor
 import hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns
 import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor
-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint
 import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace
 import java.util.Collection
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend
index 22addd3d..b8167566 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend
@@ -1,7 +1,7 @@
 package hu.bme.mit.inf.dslreasoner.run
-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint
 import org.eclipse.viatra.dse.base.ThreadContext
 import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
author	Kristóf Marussy <marussy@mit.bme.hu>	2020-11-02 02:02:40 +0100
committer	Kristóf Marussy <marussy@mit.bme.hu>	2020-11-02 02:02:40 +0100
commit	f06427cd7375551582461f91b3458339a8227f9b (patch)
tree	97bc6ec85f4c384e5080a6611b492caf460b6ce9 /Tests
parent	Must unit propagation (diff)
download	VIATRA-Generator-f06427cd7375551582461f91b3458339a8227f9b.tar.gz VIATRA-Generator-f06427cd7375551582461f91b3458339a8227f9b.tar.zst VIATRA-Generator-f06427cd7375551582461f91b3458339a8227f9b.zip

diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore new file mode 100644 index 00000000..7050a7e3 --- /dev/null +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore
@@ -0,0 +1 @@
			/queries/


diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore index 3b9ccef7..19bc3cc8 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
@@ -7,3 +7,7 @@
7	/.MemberHasParent.java._trace	7	/.MemberHasParent.java._trace
8	/.TwoMembersHaveNoParent.java._trace	8	/.TwoMembersHaveNoParent.java._trace
9	/.NegativeAge.java._trace	9	/.NegativeAge.java._trace
		10	/MemberHasParent.java
		11	/NegativeAge.java
		12	/ParentTooYoung.java
		13	/TwoMembersHaveNoParent.java


diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore index 3b9ccef7..19bc3cc8 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore
@@ -7,3 +7,7 @@
7	/.MemberHasParent.java._trace	7	/.MemberHasParent.java._trace
8	/.TwoMembersHaveNoParent.java._trace	8	/.TwoMembersHaveNoParent.java._trace
9	/.NegativeAge.java._trace	9	/.NegativeAge.java._trace
		10	/MemberHasParent.java
		11	/NegativeAge.java
		12	/ParentTooYoung.java
		13	/TwoMembersHaveNoParent.java


diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin index 5c5071cc..23513b51 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin
Binary files differ


diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend index f4f36951..9cc6e415 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
@@ -1,10 +1,10 @@
1	package hu.bme.mit.inf.dslreasoner.run	1	package hu.bme.mit.inf.dslreasoner.run
2		2
3	import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
4	import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation	3	import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
		4	import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod
5	import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint	5	import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint
6	import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod
7	import org.eclipse.viatra.dse.base.ThreadContext	6	import org.eclipse.viatra.dse.base.ThreadContext
		7	import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
8		8
9	class FileSystemInconsistencyDetector extends ModelGenerationMethodBasedGlobalConstraint {	9	class FileSystemInconsistencyDetector extends ModelGenerationMethodBasedGlobalConstraint {
10	var PartialInterpretation partialInterpretation	10	var PartialInterpretation partialInterpretation


diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend index bf9ca274..cbc692b3 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
@@ -12,8 +12,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
12	import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor	12	import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor
13	import hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns	13	import hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns
14	import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor	14	import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor
15	import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod
16	import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint	15	import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint
		16	import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod
17	import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint	17	import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint
18	import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace	18	import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace
19	import java.util.Collection	19	import java.util.Collection


diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend index 22addd3d..b8167566 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend
@@ -1,7 +1,7 @@
1	package hu.bme.mit.inf.dslreasoner.run	1	package hu.bme.mit.inf.dslreasoner.run
2		2
3	import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod
4	import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation	3	import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
		4	import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod
5	import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint	5	import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint
6	import org.eclipse.viatra.dse.base.ThreadContext	6	import org.eclipse.viatra.dse.base.ThreadContext
7	import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher	7	import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher