Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finally! a pull request for the Vampire-new branch #46

Open
wants to merge 104 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
20f131a
Initial workspace setup
ArenBabikian Jan 15, 2019
b685589
FAM MM transformation works
ArenBabikian Jan 16, 2019
717916e
Fix FAM Test. Begin Grammar Fix.
ArenBabikian Feb 1, 2019
f1d9a50
Set up #19
ArenBabikian Feb 15, 2019
1da40b0
Integrate queries partially #19
ArenBabikian Feb 16, 2019
fcb7e3a
Commit before merge
ArenBabikian Feb 17, 2019
2e5968a
Merge remote-tracking branch 'origin/master' into Vampire-New
ArenBabikian Feb 17, 2019
bcbd697
complete vsconfig files #19
ArenBabikian Feb 18, 2019
2c05097
Begin handing of scope and fix type definitions.
ArenBabikian Mar 4, 2019
df12163
Implement type scope handling
ArenBabikian Mar 5, 2019
8992907
Partially improve coding style (leaving for soccer)
ArenBabikian Mar 6, 2019
edfd98b
Continue improving code style (need sleep)
ArenBabikian Mar 6, 2019
96e6ef6
Restructure Vampire Reasoner project
ArenBabikian Mar 6, 2019
5c4471e
Implement Enum handling and study hierarchy handling
ArenBabikian Mar 6, 2019
1cdcfee
Fix Enum handling for Paradox Integration
ArenBabikian Mar 6, 2019
63cb743
Improve TypeScope handling
ArenBabikian Mar 7, 2019
04b59e1
Implement type scope for specific types
ArenBabikian Mar 13, 2019
56df1f8
Implement Containment mapping (partially) and revisit enum mapping
ArenBabikian Mar 14, 2019
9312010
Merge remote-tracking branch 'origin/master' into Vampire-New
ArenBabikian Mar 21, 2019
b42fb75
Add gitignore, commit everything
ArenBabikian Mar 21, 2019
b1af911
Add to containment, add notObject case.
ArenBabikian Mar 21, 2019
4d01994
Closes #34, adds code to test cases where minScope>maxScope.
ArenBabikian Apr 4, 2019
4829f58
Facilitate #31, close #36
ArenBabikian Apr 4, 2019
e8ec04b
Add small detail to #36
ArenBabikian Apr 5, 2019
8b23328
Revert previous commit. Everyone is happy.
ArenBabikian Apr 5, 2019
f2fed47
test push
ArenBabikian Apr 5, 2019
46995a6
Implement containment circularity avoidance #20
ArenBabikian Apr 5, 2019
77f583c
VAMPIRE: #39 Reorganise tests, working yakindu test, need debugging
ArenBabikian Apr 11, 2019
2f81496
VAMPIRE: close #22, improve test structure for #39, .vql file trouble
ArenBabikian Apr 15, 2019
515d94e
VAMPIRE: add to #40. I am tired
ArenBabikian Apr 24, 2019
8af821e
VAMPIRE : initial model handling almost done. only typeScope remains #40
ArenBabikian Apr 24, 2019
9f743fd
VAMPIRE: fixed MANY bugs in containment and scope. #40 is good for now
ArenBabikian Apr 25, 2019
f1f2a1f
Pre-realisticBranchCreation Commit
ArenBabikian May 13, 2019
6b70878
VAMPIRE: integrate local Vampire executeable #32
ArenBabikian Aug 28, 2019
9ef9aef
VAMPIRE: adapt grammar to Vampire solution + get model from text
ArenBabikian Aug 29, 2019
9c1450f
VAMPIRE: setup structure of model interpretation
ArenBabikian Aug 29, 2019
4474dfb
VAMPIRE: implement Vampire Model Interpreter, 2/3 done
ArenBabikian Sep 2, 2019
9fc9e41
VAMPIRE: complete first version of VampireModelInterpretation
ArenBabikian Sep 3, 2019
71108d4
VAMPIRE: Implement wf constraint handling
ArenBabikian Sep 8, 2019
ce5aafc
VAMPIRE: fix model generation
ArenBabikian Sep 11, 2019
5d1165c
VAMPIRE: Implement Vampire measurement code
ArenBabikian Oct 7, 2019
f63a94c
VAMPIRE: fix bug in transformation, further implement measurement code
ArenBabikian Oct 8, 2019
abf9662
VAMPIRE: Further develop testing fo r Vampire solver
ArenBabikian Oct 9, 2019
16f9cd4
implement http requests for the TPTP server
ArenBabikian Oct 11, 2019
17d6aa5
VAMPIRE: complete testing setup
ArenBabikian Oct 11, 2019
e0fc38c
VAMPIRE: complete data collection and code setup
ArenBabikian Oct 13, 2019
012e1cb
mid-measurement push
ArenBabikian Oct 21, 2019
25a4b1b
VAMPIRE: post-submission push
ArenBabikian Oct 25, 2019
4d8fdbc
VAMPIRE: Further Post-submission updates
ArenBabikian Nov 24, 2019
4d27f27
VAMPIRE: last commit
ArenBabikian Feb 3, 2020
8ecc73c
VAMPIRE: Rebase on Master
ArenBabikian Jun 6, 2020
f87b423
Initial workspace setup
ArenBabikian Jan 15, 2019
07073f1
FAM MM transformation works
ArenBabikian Jan 16, 2019
57e614a
Fix FAM Test. Begin Grammar Fix.
ArenBabikian Feb 1, 2019
cd87de9
Set up #19
ArenBabikian Feb 15, 2019
d6839b0
Integrate queries partially #19
ArenBabikian Feb 16, 2019
1942180
Commit before merge
ArenBabikian Feb 17, 2019
d1c0835
complete vsconfig files #19
ArenBabikian Feb 18, 2019
9643b7b
Begin handing of scope and fix type definitions.
ArenBabikian Mar 4, 2019
f019f3e
Implement type scope handling
ArenBabikian Mar 5, 2019
3d92a0e
Partially improve coding style (leaving for soccer)
ArenBabikian Mar 6, 2019
54431d1
Continue improving code style (need sleep)
ArenBabikian Mar 6, 2019
f4a37cb
Restructure Vampire Reasoner project
ArenBabikian Mar 6, 2019
6cac004
Implement Enum handling and study hierarchy handling
ArenBabikian Mar 6, 2019
f1245cf
Fix Enum handling for Paradox Integration
ArenBabikian Mar 6, 2019
0380611
Improve TypeScope handling
ArenBabikian Mar 7, 2019
2ce7f84
Implement type scope for specific types
ArenBabikian Mar 13, 2019
d7730cb
Implement Containment mapping (partially) and revisit enum mapping
ArenBabikian Mar 14, 2019
513a5af
Add gitignore, commit everything
ArenBabikian Mar 21, 2019
36b3b95
Add to containment, add notObject case.
ArenBabikian Mar 21, 2019
844c46e
Closes #34, adds code to test cases where minScope>maxScope.
ArenBabikian Apr 4, 2019
9a77070
Facilitate #31, close #36
ArenBabikian Apr 4, 2019
0145f83
Add small detail to #36
ArenBabikian Apr 5, 2019
187e957
Revert previous commit. Everyone is happy.
ArenBabikian Apr 5, 2019
0dc934c
test push
ArenBabikian Apr 5, 2019
b1bbb82
Implement containment circularity avoidance #20
ArenBabikian Apr 5, 2019
ab556f8
VAMPIRE: #39 Reorganise tests, working yakindu test, need debugging
ArenBabikian Apr 11, 2019
85e6d0b
VAMPIRE: close #22, improve test structure for #39, .vql file trouble
ArenBabikian Apr 15, 2019
13cb6b3
VAMPIRE: add to #40. I am tired
ArenBabikian Apr 24, 2019
06b2801
VAMPIRE : initial model handling almost done. only typeScope remains #40
ArenBabikian Apr 24, 2019
598daf4
VAMPIRE: fixed MANY bugs in containment and scope. #40 is good for now
ArenBabikian Apr 25, 2019
627db28
Pre-realisticBranchCreation Commit
ArenBabikian May 13, 2019
fcad3b0
Pre-realisticBranchCreation Commit
ArenBabikian May 13, 2019
4c34e22
VAMPIRE: integrate local Vampire executeable #32
ArenBabikian Aug 28, 2019
15602c7
VAMPIRE: adapt grammar to Vampire solution + get model from text
ArenBabikian Aug 29, 2019
5cfe202
VAMPIRE: setup structure of model interpretation
ArenBabikian Aug 29, 2019
35ac379
VAMPIRE: implement Vampire Model Interpreter, 2/3 done
ArenBabikian Sep 2, 2019
7b13c62
VAMPIRE: complete first version of VampireModelInterpretation
ArenBabikian Sep 3, 2019
4aee5bc
VAMPIRE: Implement wf constraint handling
ArenBabikian Sep 8, 2019
a6ac842
VAMPIRE: fix model generation
ArenBabikian Sep 11, 2019
b503c81
VAMPIRE: Implement Vampire measurement code
ArenBabikian Oct 7, 2019
d0e4ffc
VAMPIRE: fix bug in transformation, further implement measurement code
ArenBabikian Oct 8, 2019
8ec0122
VAMPIRE: Further develop testing fo r Vampire solver
ArenBabikian Oct 9, 2019
b97501f
implement http requests for the TPTP server
ArenBabikian Oct 11, 2019
606f696
VAMPIRE: complete testing setup
ArenBabikian Oct 11, 2019
635b4b6
VAMPIRE: complete data collection and code setup
ArenBabikian Oct 13, 2019
7379cc6
mid-measurement push
ArenBabikian Oct 21, 2019
32a4f33
VAMPIRE: post-submission push
ArenBabikian Oct 25, 2019
7d44e20
VAMPIRE: Further Post-submission updates
ArenBabikian Nov 24, 2019
8e461ef
VAMPIRE: last commit
ArenBabikian Feb 3, 2020
8a5c12d
VAMPIRE: Rebase on Master
ArenBabikian Jun 6, 2020
adddfa2
Merge branch 'Vampire-New' into Vampire-New
ArenBabikian Jun 8, 2020
022a1e5
remove Alloy solver copy
ArenBabikian Jun 13, 2020
3997c24
This branch is ready to be merged into master
ArenBabikian Jun 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/bin/
/xtend-gen/
/src-gen/
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: hu.bme.mit.inf.dslreasoner.application,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide,
org.antlr.runtime
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: hu.bme.mit.inf.dslreasoner.application.ide.contentassist.antlr.internal,
hu.bme.mit.inf.dslreasoner.application.ide.contentassist.antlr
Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.application.ide

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.12.0
* generated by Xtext 2.21.0
*/
package hu.bme.mit.inf.dslreasoner.application.ide;

Expand All @@ -15,6 +15,9 @@
import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper;
import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer;
import org.eclipse.xtext.ide.refactoring.IRenameStrategy2;
import org.eclipse.xtext.ide.server.rename.IRenameService2;
import org.eclipse.xtext.ide.server.rename.RenameService2;

/**
* Manual modifications go to {@link ApplicationConfigurationIdeModule}.
Expand Down Expand Up @@ -44,4 +47,14 @@ public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
return FQNPrefixMatcher.class;
}

// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
public Class<? extends IRenameService2> bindIRenameService2() {
return RenameService2.class;
}

// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
public Class<? extends IRenameStrategy2> bindIRenameStrategy2() {
return IRenameStrategy2.DefaultImpl.class;
}

}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.12.0
* generated by Xtext 2.21.0
*/
package hu.bme.mit.inf.dslreasoner.application.ide.contentassist.antlr;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.12.0
* generated by Xtext 2.21.0
*/
grammar InternalApplicationConfiguration;

Expand Down Expand Up @@ -2373,6 +2373,12 @@ rule__Solver__Alternatives
('ViatraSolver')
{ after(grammarAccess.getSolverAccess().getViatraSolverEnumLiteralDeclaration_2()); }
)
|
(
{ before(grammarAccess.getSolverAccess().getTPTPSolverEnumLiteralDeclaration_3()); }
('TPTPSolver')
{ after(grammarAccess.getSolverAccess().getTPTPSolverEnumLiteralDeclaration_3()); }
)
;
finally {
restoreStackSize(stackSize);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,50 +1,51 @@
'#'=38
'*'=55
'+='=54
','=26
'-'=18
'.'=17
'..'=45
'::'=29
'<'=39
'='=23
'>'=40
'#'=39
'*'=56
'+='=55
','=27
'-'=19
'.'=18
'..'=46
'::'=30
'<'=40
'='=24
'>'=41
'AlloySolver'=15
'SMTSolver'=14
'TPTPSolver'=17
'ViatraSolver'=16
'config'=34
'constraints'=33
'debug'=50
'epackage'=20
'excluding'=28
'file'=22
'folder'=31
'config'=35
'constraints'=34
'debug'=51
'epackage'=21
'excluding'=29
'file'=23
'folder'=32
'full'=13
'generate'=47
'import'=19
'int'=42
'log'=51
'log-level'=35
'memory'=37
'metamodel'=30
'models'=32
'node'=41
'generate'=48
'import'=20
'int'=43
'log'=52
'log-level'=36
'memory'=38
'metamodel'=31
'models'=33
'node'=42
'none'=11
'normal'=12
'number'=56
'output'=53
'package'=27
'partial-model'=48
'real'=43
'runs'=57
'runtime'=36
'scope'=46
'solver'=49
'statistics'=52
'string'=44
'viatra'=21
'{'=24
'}'=25
'number'=57
'output'=54
'package'=28
'partial-model'=49
'real'=44
'runs'=58
'runtime'=37
'scope'=47
'solver'=50
'statistics'=53
'string'=45
'viatra'=22
'{'=25
'}'=26
RULE_ANY_OTHER=10
RULE_ID=4
RULE_INT=5
Expand Down Expand Up @@ -99,3 +100,4 @@ T__54=54
T__55=55
T__56=56
T__57=57
T__58=58
Loading