Skip to content

Initialisation #36

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Initialisation #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34404d0
added schema location to output files
Leative Mar 1, 2018
1cc6f34
added copy of meta model to experiments folder; before result is save…
Leative Mar 14, 2018
1478996
moved MDEOResultsOutput init after null check
Leative May 9, 2018
aba4266
changed grammar to allow specification of multiple instance models; i…
Leative May 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...k.ac.kcl.mdeoptimise.ide/src-gen/uk/ac/kcl/ide/contentassist/antlr/MDEOptimiseParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getOptimisationAccess().getGroup(), "rule__Optimisation__Group__0");
put(grammarAccess.getBasePathSpecAccess().getGroup(), "rule__BasePathSpec__Group__0");
put(grammarAccess.getMetaModelSpecAccess().getGroup(), "rule__MetaModelSpec__Group__0");
put(grammarAccess.getModelPathSpecAccess().getGroup(), "rule__ModelPathSpec__Group__0");
put(grammarAccess.getModelPathSpecsAccess().getGroup(), "rule__ModelPathSpecs__Group__0");
put(grammarAccess.getObjectiveInterpreterSpecAccess().getGroup(), "rule__ObjectiveInterpreterSpec__Group__0");
put(grammarAccess.getConstraintInterpreterSpecAccess().getGroup(), "rule__ConstraintInterpreterSpec__Group__0");
put(grammarAccess.getEvolverSpecAccess().getGroup(), "rule__EvolverSpec__Group__0");
Expand Down Expand Up @@ -276,14 +276,14 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getQualifiedNameInStaticImportAccess().getGroup(), "rule__QualifiedNameInStaticImport__Group__0");
put(grammarAccess.getOptimisationAccess().getBasepathAssignment_0(), "rule__Optimisation__BasepathAssignment_0");
put(grammarAccess.getOptimisationAccess().getMetamodelAssignment_1(), "rule__Optimisation__MetamodelAssignment_1");
put(grammarAccess.getOptimisationAccess().getModelAssignment_2(), "rule__Optimisation__ModelAssignment_2");
put(grammarAccess.getOptimisationAccess().getModelsAssignment_2(), "rule__Optimisation__ModelsAssignment_2");
put(grammarAccess.getOptimisationAccess().getObjectivesAssignment_3(), "rule__Optimisation__ObjectivesAssignment_3");
put(grammarAccess.getOptimisationAccess().getConstraintsAssignment_4(), "rule__Optimisation__ConstraintsAssignment_4");
put(grammarAccess.getOptimisationAccess().getEvolversAssignment_5(), "rule__Optimisation__EvolversAssignment_5");
put(grammarAccess.getOptimisationAccess().getOptimisationAssignment_6(), "rule__Optimisation__OptimisationAssignment_6");
put(grammarAccess.getBasePathSpecAccess().getLocationAssignment_1(), "rule__BasePathSpec__LocationAssignment_1");
put(grammarAccess.getMetaModelSpecAccess().getLocationAssignment_1(), "rule__MetaModelSpec__LocationAssignment_1");
put(grammarAccess.getModelPathSpecAccess().getLocationAssignment_1(), "rule__ModelPathSpec__LocationAssignment_1");
put(grammarAccess.getModelPathSpecsAccess().getLocationsAssignment_1(), "rule__ModelPathSpecs__LocationsAssignment_1");
put(grammarAccess.getObjectiveInterpreterSpecAccess().getObjectiveNameAssignment_1(), "rule__ObjectiveInterpreterSpec__ObjectiveNameAssignment_1");
put(grammarAccess.getObjectiveInterpreterSpecAccess().getObjectiveTendencyAssignment_2(), "rule__ObjectiveInterpreterSpec__ObjectiveTendencyAssignment_2");
put(grammarAccess.getObjectiveInterpreterSpecAccess().getObjectiveTypeAssignment_3(), "rule__ObjectiveInterpreterSpec__ObjectiveTypeAssignment_3");
Expand Down
73 changes: 40 additions & 33 deletions ....mdeoptimise.ide/src-gen/uk/ac/kcl/ide/contentassist/antlr/internal/InternalMDEOptimise.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,25 +125,25 @@ finally {
restoreStackSize(stackSize);
}

// Entry rule entryRuleModelPathSpec
entryRuleModelPathSpec
// Entry rule entryRuleModelPathSpecs
entryRuleModelPathSpecs
:
{ before(grammarAccess.getModelPathSpecRule()); }
ruleModelPathSpec
{ after(grammarAccess.getModelPathSpecRule()); }
{ before(grammarAccess.getModelPathSpecsRule()); }
ruleModelPathSpecs
{ after(grammarAccess.getModelPathSpecsRule()); }
EOF
;

// Rule ModelPathSpec
ruleModelPathSpec
// Rule ModelPathSpecs
ruleModelPathSpecs
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getModelPathSpecAccess().getGroup()); }
(rule__ModelPathSpec__Group__0)
{ after(grammarAccess.getModelPathSpecAccess().getGroup()); }
{ before(grammarAccess.getModelPathSpecsAccess().getGroup()); }
(rule__ModelPathSpecs__Group__0)
{ after(grammarAccess.getModelPathSpecsAccess().getGroup()); }
)
;
finally {
Expand Down Expand Up @@ -3489,9 +3489,9 @@ rule__Optimisation__Group__2__Impl
}
:
(
{ before(grammarAccess.getOptimisationAccess().getModelAssignment_2()); }
(rule__Optimisation__ModelAssignment_2)
{ after(grammarAccess.getOptimisationAccess().getModelAssignment_2()); }
{ before(grammarAccess.getOptimisationAccess().getModelsAssignment_2()); }
(rule__Optimisation__ModelsAssignment_2)
{ after(grammarAccess.getOptimisationAccess().getModelsAssignment_2()); }
)
;
finally {
Expand Down Expand Up @@ -3728,53 +3728,60 @@ finally {
}


rule__ModelPathSpec__Group__0
rule__ModelPathSpecs__Group__0
@init {
int stackSize = keepStackSize();
}
:
rule__ModelPathSpec__Group__0__Impl
rule__ModelPathSpec__Group__1
rule__ModelPathSpecs__Group__0__Impl
rule__ModelPathSpecs__Group__1
;
finally {
restoreStackSize(stackSize);
}

rule__ModelPathSpec__Group__0__Impl
rule__ModelPathSpecs__Group__0__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getModelPathSpecAccess().getModelKeyword_0()); }
'model'
{ after(grammarAccess.getModelPathSpecAccess().getModelKeyword_0()); }
{ before(grammarAccess.getModelPathSpecsAccess().getModelsKeyword_0()); }
'models'
{ after(grammarAccess.getModelPathSpecsAccess().getModelsKeyword_0()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__ModelPathSpec__Group__1
rule__ModelPathSpecs__Group__1
@init {
int stackSize = keepStackSize();
}
:
rule__ModelPathSpec__Group__1__Impl
rule__ModelPathSpecs__Group__1__Impl
;
finally {
restoreStackSize(stackSize);
}

rule__ModelPathSpec__Group__1__Impl
rule__ModelPathSpecs__Group__1__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getModelPathSpecAccess().getLocationAssignment_1()); }
(rule__ModelPathSpec__LocationAssignment_1)
{ after(grammarAccess.getModelPathSpecAccess().getLocationAssignment_1()); }
(
{ before(grammarAccess.getModelPathSpecsAccess().getLocationsAssignment_1()); }
(rule__ModelPathSpecs__LocationsAssignment_1)
{ after(grammarAccess.getModelPathSpecsAccess().getLocationsAssignment_1()); }
)
(
{ before(grammarAccess.getModelPathSpecsAccess().getLocationsAssignment_1()); }
(rule__ModelPathSpecs__LocationsAssignment_1)*
{ after(grammarAccess.getModelPathSpecsAccess().getLocationsAssignment_1()); }
)
)
;
finally {
Expand Down Expand Up @@ -16968,15 +16975,15 @@ finally {
restoreStackSize(stackSize);
}

rule__Optimisation__ModelAssignment_2
rule__Optimisation__ModelsAssignment_2
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getOptimisationAccess().getModelModelPathSpecParserRuleCall_2_0()); }
ruleModelPathSpec
{ after(grammarAccess.getOptimisationAccess().getModelModelPathSpecParserRuleCall_2_0()); }
{ before(grammarAccess.getOptimisationAccess().getModelsModelPathSpecsParserRuleCall_2_0()); }
ruleModelPathSpecs
{ after(grammarAccess.getOptimisationAccess().getModelsModelPathSpecsParserRuleCall_2_0()); }
)
;
finally {
Expand Down Expand Up @@ -17073,15 +17080,15 @@ finally {
restoreStackSize(stackSize);
}

rule__ModelPathSpec__LocationAssignment_1
rule__ModelPathSpecs__LocationsAssignment_1
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getModelPathSpecAccess().getLocationURLTerminalRuleCall_1_0()); }
{ before(grammarAccess.getModelPathSpecsAccess().getLocationsURLTerminalRuleCall_1_0()); }
RULE_URL
{ after(grammarAccess.getModelPathSpecAccess().getLocationURLTerminalRuleCall_1_0()); }
{ after(grammarAccess.getModelPathSpecsAccess().getLocationsURLTerminalRuleCall_1_0()); }
)
;
finally {
Expand Down
2 changes: 1 addition & 1 deletion ...ptimise.ide/src-gen/uk/ac/kcl/ide/contentassist/antlr/internal/InternalMDEOptimise.tokens
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
'import'=55
'instanceof'=81
'metamodel'=62
'model'=63
'models'=63
'mutate'=59
'new'=96
'null'=97
Expand Down
Loading