VIATRA-Generator - Mirror of https://github.com/viatra/VIATRA-Generator

	Commit message (Collapse)	Author	Age
*	This branch is ready to be merged into masterVampire-New	ArenBabikian	2020-06-14
\|
*	remove Alloy solver copy	ArenBabikian	2020-06-13
\|
*	Merge branch 'Vampire-New' into Vampire-New	ArenBabikian	2020-06-07
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeScopeMapping.xtend Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Entry.java Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Synchronization.java Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/EntryImpl.java Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/SynchronizationImpl.java
\| *	VAMPIRE: Rebase on Master	ArenBabikian	2020-06-06
\| \|
\| *	VAMPIRE: last commit	ArenBabikian	2020-02-03
\| \|
\| *	VAMPIRE: Further Post-submission updates	ArenBabikian	2019-11-24
\| \|
\| *	VAMPIRE: post-submission push	ArenBabikian	2019-10-25
\| \|
\| *	mid-measurement push	ArenBabikian	2019-10-21
\| \|
\| *	VAMPIRE: complete data collection and code setup	ArenBabikian	2019-10-12
\| \|
\| *	VAMPIRE: complete testing setup	ArenBabikian	2019-10-11
\| \|
\| *	implement http requests for the TPTP server	ArenBabikian	2019-10-10
\| \|
\| *	VAMPIRE: Further develop testing fo r Vampire solver	ArenBabikian	2019-10-09
\| \|
\| *	VAMPIRE: fix bug in transformation, further implement measurement code	ArenBabikian	2019-10-08
\| \|
\| *	VAMPIRE: Implement Vampire measurement code	ArenBabikian	2019-10-07
\| \|
\| *	VAMPIRE: fix model generation	ArenBabikian	2019-09-11
\| \|
\| *	VAMPIRE: Implement wf constraint handling	ArenBabikian	2019-09-08
\| \|
\| *	VAMPIRE: complete first version of VampireModelInterpretation	ArenBabikian	2019-09-03
\| \|
\| *	VAMPIRE: implement Vampire Model Interpreter, 2/3 done	ArenBabikian	2019-09-02
\| \|
\| *	VAMPIRE: setup structure of model interpretation	ArenBabikian	2019-08-29
\| \|
\| *	VAMPIRE: adapt grammar to Vampire solution + get model from text	ArenBabikian	2019-08-29
\| \|
\| *	VAMPIRE: integrate local Vampire executeable #32	ArenBabikian	2019-08-28
\| \|
\| *	Pre-realisticBranchCreation Commit	ArenBabikian	2019-05-12
\| \|
\| *	VAMPIRE: fixed MANY bugs in containment and scope. #40 is good for now	ArenBabikian	2019-04-25
\| \|
\| *	VAMPIRE : initial model handling almost done. only typeScope remains #40	ArenBabikian	2019-04-24
\| \|
\| *	VAMPIRE: add to #40. I am tired	ArenBabikian	2019-04-24
\| \|
\| *	VAMPIRE: close #22, improve test structure for #39, .vql file trouble	ArenBabikian	2019-04-15
\| \|
\| *	VAMPIRE: #39 Reorganise tests, working yakindu test, need debugging	ArenBabikian	2019-04-11
\| \|
\| *	Implement containment circularity avoidance #20	ArenBabikian	2019-04-05
\| \|
\| *	test push	ArenBabikian	2019-04-04
\| \|
\| *	Revert previous commit. Everyone is happy.	ArenBabikian	2019-04-04
\| \|
\| *	Add small detail to #36	ArenBabikian	2019-04-04
\| \|
\| *	Facilitate #31, close #36	ArenBabikian	2019-04-04
\| \|
\| *	Closes #34, adds code to test cases where minScope>maxScope.	ArenBabikian	2019-04-04
\| \|
\| *	Add to containment, add notObject case.	ArenBabikian	2019-03-21
\| \|
\| *	Add gitignore, commit everything	ArenBabikian	2019-03-20
\| \|
\| *	Merge remote-tracking branch 'origin/master' into Vampire-New	ArenBabikian	2019-03-20
\| \|\ \| \| \| \| \| \| \| \| \|	Merginf oszkar's update
\| * \|	Implement Containment mapping (partially) and revisit enum mapping	ArenBabikian	2019-03-14
\| \| \|
\| * \|	Implement type scope for specific types	ArenBabikian	2019-03-13
\| \| \|
\| * \|	Improve TypeScope handling	ArenBabikian	2019-03-07
\| \| \|
\| * \|	Fix Enum handling for Paradox Integration	ArenBabikian	2019-03-06
\| \| \|
\| * \|	Implement Enum handling and study hierarchy handling	ArenBabikian	2019-03-06
\| \| \|
\| * \|	Restructure Vampire Reasoner project	ArenBabikian	2019-03-06
\| \| \|
\| * \|	Continue improving code style (need sleep)	ArenBabikian	2019-03-06
\| \| \|
\| * \|	Partially improve coding style (leaving for soccer)	ArenBabikian	2019-03-05
\| \| \|
\| * \|	Implement type scope handling	ArenBabikian	2019-03-05
\| \| \|
\| * \|	Begin handing of scope and fix type definitions.	ArenBabikian	2019-03-04
\| \| \|
\| * \|	complete vsconfig files #19	ArenBabikian	2019-02-17
\| \| \|
\| * \|	Merge remote-tracking branch 'origin/master' into Vampire-New	ArenBabikian	2019-02-17
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Merge Oszkar's Java-related commit
\| * \| \|	Commit before merge	ArenBabikian	2019-02-17
\| \| \| \|
\| * \| \|	Integrate queries partially #19	ArenBabikian	2019-02-16
\| \| \| \|