Skip to content

Integrated crossover implementation splitting and recombining EMF models based on category theory (MDOver) #118

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 17 commits into
base: develop
Choose a base branch
from
Open

Integrated crossover implementation splitting and recombining EMF models based on category theory (MDOver) #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b0d9c80
added ProblemPartSpecifier to mopt-DSL; added MDO-Crossover project t…
Leative May 5, 2022
e05cea0
rebase to changes in develop; adaption of henshin version etc.
Leative May 10, 2022
a6552d2
fix: unmutated crossover result is now directly added as offspring
Leative May 12, 2022
f7d7999
Merge branch 'fixMoeaProbabilisticVariation' into addingCrossover
Leative May 12, 2022
5667ff4
fix: substituted direct casting from object array to solution array b…
Leative May 12, 2022
8c8435b
Merge branch 'fixCastingExceptionInMoeaProbabilisticVariant' into add…
Leative May 12, 2022
f35e1a9
reactivated correct parsing of crossover and mutation rates
Leative May 12, 2022
d097924
removed directory erroneously created and added to the build/maven dir
Leative Jun 30, 2022
84630bd
changed embedding of crossover: crossover is now available as a maven…
Leative Jul 1, 2022
c7c501a
added repair variation which applies a repair strategy after evolutio…
Leative May 12, 2022
4e7a259
fix: repair.strategy token substituted by rep.strategy since the pars…
Leative May 13, 2022
0982c6a
fixed repair 'none' repair strategy raising exception
Leative May 24, 2022
342634a
fixed exception being thrown when no rep.strategy is specified in mopt
Leative Jul 27, 2022
17b8ac1
fixed probabilities of 0 not working as expected when RNG produces 0
Leative Sep 8, 2023
9dd61c0
Merge branch 'feature/integrating_crossover_repair_strategy' into fea…
Leative Dec 2, 2023
d586b95
adapted calls to renamed packages of mdo-over
Leative Dec 3, 2023
59b9e6f
fixed javadoc
Leative Dec 3, 2023
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
4 changes: 4 additions & 0 deletions build/maven/template/pom.xml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
<id>m2.moeaframework</id>
<url>https://mde-optimiser.github.io/mdeo_repo/repository/m2/moeaframework/</url>
</repository>
<repository>
<id>m2.mdo-over</id>
<url>https://mdo-over.github.io/m2repo/</url>
</repository>
</repositories>
<!-- Load JUnit 5 Bom -->
<dependencyManagement>
Expand Down
1 change: 1 addition & 0 deletions interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<import plugin="uk.ac.kcl.inf.mdeoptimiser.interfaces.cli"/>
<import plugin="uk.ac.kcl.inf.mdeoptimiser.libraries.core"/>
<import plugin="uk.ac.kcl.inf.mdeoptimiser.libraries.rulegen"/>
<import plugin="de.uni_marburg.mdo-over"/>
<import plugin="org.eclipse.emf.henshin.interpreter" version="1.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.henshin.model" version="1.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.henshin.trace" version="1.7.0" match="greaterOrEqual"/>
Expand Down
1 change: 1 addition & 0 deletions ...ipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<unit id="uk.ac.kcl.inf.mdeoptimiser.libraries.core.source" version="0.0.0" />
<unit id="uk.ac.kcl.inf.mdeoptimiser.libraries.rulegen" version="0.0.0" />
<unit id="uk.ac.kcl.inf.mdeoptimiser.libraries.rulegen.source" version="0.0.0" />
<unit id="de.uni_marburg.mdo-over" version="0.0.0" />
<unit id="org.moeaframework" version="0.0.0" />
<unit id="org.moeaframework.source" version="0.0.0" />
<unit id="com.github.mifmif.generex" version="0.0.0" />
Expand Down
Empty file removed ...ces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/xtend-gen/.gitkeep
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions ...e.ui/src-gen/uk/ac/kcl/inf/mdeoptimiser/languages/ide/contentassist/antlr/MoptParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
builder.put(grammarAccess.getObjectiveInterpreterSpecAccess().getGroup(), "rule__ObjectiveInterpreterSpec__Group__0");
builder.put(grammarAccess.getConstraintInterpreterSpecAccess().getGroup(), "rule__ConstraintInterpreterSpec__Group__0");
builder.put(grammarAccess.getModelInitialiserSpecAccess().getGroup(), "rule__ModelInitialiserSpec__Group__0");
builder.put(grammarAccess.getProblemPartSpecifierAccess().getGroup(), "rule__ProblemPartSpecifier__Group__0");
builder.put(grammarAccess.getRulegenSpecAccess().getGroup(), "rule__RulegenSpec__Group__0");
builder.put(grammarAccess.getRulegenNodeAccess().getGroup(), "rule__RulegenNode__Group__0");
builder.put(grammarAccess.getRulegenNodeAccess().getGroup_1(), "rule__RulegenNode__Group_1__0");
Expand Down Expand Up @@ -301,6 +302,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
builder.put(grammarAccess.getProblemSpecAccess().getMetamodelAssignment_3(), "rule__ProblemSpec__MetamodelAssignment_3");
builder.put(grammarAccess.getProblemSpecAccess().getModelAssignment_4(), "rule__ProblemSpec__ModelAssignment_4");
builder.put(grammarAccess.getProblemSpecAccess().getModelInitialiserAssignment_5(), "rule__ProblemSpec__ModelInitialiserAssignment_5");
builder.put(grammarAccess.getProblemSpecAccess().getProblemPartsAssignment_6(), "rule__ProblemSpec__ProblemPartsAssignment_6");
builder.put(grammarAccess.getGoalSpecAccess().getRefinementsAssignment_2(), "rule__GoalSpec__RefinementsAssignment_2");
builder.put(grammarAccess.getGoalSpecAccess().getObjectivesAssignment_3(), "rule__GoalSpec__ObjectivesAssignment_3");
builder.put(grammarAccess.getGoalSpecAccess().getConstraintsAssignment_4(), "rule__GoalSpec__ConstraintsAssignment_4");
Expand All @@ -324,6 +326,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
builder.put(grammarAccess.getConstraintInterpreterSpecAccess().getConstraintTypeAssignment_2(), "rule__ConstraintInterpreterSpec__ConstraintTypeAssignment_2");
builder.put(grammarAccess.getConstraintInterpreterSpecAccess().getConstraintSpecAssignment_4(), "rule__ConstraintInterpreterSpec__ConstraintSpecAssignment_4");
builder.put(grammarAccess.getModelInitialiserSpecAccess().getInitialiserAssignment_3(), "rule__ModelInitialiserSpec__InitialiserAssignment_3");
builder.put(grammarAccess.getProblemPartSpecifierAccess().getProblemPartSpecifierAssignment_4(), "rule__ProblemPartSpecifier__ProblemPartSpecifierAssignment_4");
builder.put(grammarAccess.getRulegenSpecAccess().getNodeSpecAssignment_2_0(), "rule__RulegenSpec__NodeSpecAssignment_2_0");
builder.put(grammarAccess.getRulegenSpecAccess().getEdgeSpecAssignment_2_1(), "rule__RulegenSpec__EdgeSpecAssignment_2_1");
builder.put(grammarAccess.getRulegenNodeAccess().getNodeAssignment_0(), "rule__RulegenNode__NodeAssignment_0");
Expand Down
227 changes: 225 additions & 2 deletions ...-gen/uk/ac/kcl/inf/mdeoptimiser/languages/ide/contentassist/antlr/internal/InternalMopt.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,31 @@ finally {
restoreStackSize(stackSize);
}

// Entry rule entryRuleProblemPartSpecifier
entryRuleProblemPartSpecifier
:
{ before(grammarAccess.getProblemPartSpecifierRule()); }
ruleProblemPartSpecifier
{ after(grammarAccess.getProblemPartSpecifierRule()); }
EOF
;

// Rule ProblemPartSpecifier
ruleProblemPartSpecifier
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getProblemPartSpecifierAccess().getGroup()); }
(rule__ProblemPartSpecifier__Group__0)
{ after(grammarAccess.getProblemPartSpecifierAccess().getGroup()); }
)
;
finally {
restoreStackSize(stackSize);
}

// Entry rule entryRuleRulegenSpec
entryRuleRulegenSpec
:
Expand Down Expand Up @@ -3827,6 +3852,12 @@ rule__EvolverType__Alternatives
('breed')
{ after(grammarAccess.getEvolverTypeAccess().getBREEDEnumLiteralDeclaration_1()); }
)
|
(
{ before(grammarAccess.getEvolverTypeAccess().getREPAIREnumLiteralDeclaration_2()); }
('repair')
{ after(grammarAccess.getEvolverTypeAccess().getREPAIREnumLiteralDeclaration_2()); }
)
;
finally {
restoreStackSize(stackSize);
Expand Down Expand Up @@ -4108,6 +4139,7 @@ rule__ProblemSpec__Group__6
}
:
rule__ProblemSpec__Group__6__Impl
rule__ProblemSpec__Group__7
;
finally {
restoreStackSize(stackSize);
Expand All @@ -4119,9 +4151,35 @@ rule__ProblemSpec__Group__6__Impl
}
:
(
{ before(grammarAccess.getProblemSpecAccess().getRightCurlyBracketKeyword_6()); }
{ before(grammarAccess.getProblemSpecAccess().getProblemPartsAssignment_6()); }
(rule__ProblemSpec__ProblemPartsAssignment_6)?
{ after(grammarAccess.getProblemSpecAccess().getProblemPartsAssignment_6()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__ProblemSpec__Group__7
@init {
int stackSize = keepStackSize();
}
:
rule__ProblemSpec__Group__7__Impl
;
finally {
restoreStackSize(stackSize);
}

rule__ProblemSpec__Group__7__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getProblemSpecAccess().getRightCurlyBracketKeyword_7()); }
'}'
{ after(grammarAccess.getProblemSpecAccess().getRightCurlyBracketKeyword_6()); }
{ after(grammarAccess.getProblemSpecAccess().getRightCurlyBracketKeyword_7()); }
)
;
finally {
Expand Down Expand Up @@ -5621,6 +5679,141 @@ finally {
}


rule__ProblemPartSpecifier__Group__0
@init {
int stackSize = keepStackSize();
}
:
rule__ProblemPartSpecifier__Group__0__Impl
rule__ProblemPartSpecifier__Group__1
;
finally {
restoreStackSize(stackSize);
}

rule__ProblemPartSpecifier__Group__0__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getProblemPartSpecifierAccess().getDefineKeyword_0()); }
'define'
{ after(grammarAccess.getProblemPartSpecifierAccess().getDefineKeyword_0()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__ProblemPartSpecifier__Group__1
@init {
int stackSize = keepStackSize();
}
:
rule__ProblemPartSpecifier__Group__1__Impl
rule__ProblemPartSpecifier__Group__2
;
finally {
restoreStackSize(stackSize);
}

rule__ProblemPartSpecifier__Group__1__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getProblemPartSpecifierAccess().getProblemKeyword_1()); }
'problem'
{ after(grammarAccess.getProblemPartSpecifierAccess().getProblemKeyword_1()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__ProblemPartSpecifier__Group__2
@init {
int stackSize = keepStackSize();
}
:
rule__ProblemPartSpecifier__Group__2__Impl
rule__ProblemPartSpecifier__Group__3
;
finally {
restoreStackSize(stackSize);
}

rule__ProblemPartSpecifier__Group__2__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getProblemPartSpecifierAccess().getPartKeyword_2()); }
'part'
{ after(grammarAccess.getProblemPartSpecifierAccess().getPartKeyword_2()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__ProblemPartSpecifier__Group__3
@init {
int stackSize = keepStackSize();
}
:
rule__ProblemPartSpecifier__Group__3__Impl
rule__ProblemPartSpecifier__Group__4
;
finally {
restoreStackSize(stackSize);
}

rule__ProblemPartSpecifier__Group__3__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getProblemPartSpecifierAccess().getUsingKeyword_3()); }
'using'
{ after(grammarAccess.getProblemPartSpecifierAccess().getUsingKeyword_3()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__ProblemPartSpecifier__Group__4
@init {
int stackSize = keepStackSize();
}
:
rule__ProblemPartSpecifier__Group__4__Impl
;
finally {
restoreStackSize(stackSize);
}

rule__ProblemPartSpecifier__Group__4__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getProblemPartSpecifierAccess().getProblemPartSpecifierAssignment_4()); }
(rule__ProblemPartSpecifier__ProblemPartSpecifierAssignment_4)
{ after(grammarAccess.getProblemPartSpecifierAccess().getProblemPartSpecifierAssignment_4()); }
)
;
finally {
restoreStackSize(stackSize);
}


rule__RulegenSpec__Group__0
@init {
int stackSize = keepStackSize();
Expand Down Expand Up @@ -19492,6 +19685,21 @@ finally {
restoreStackSize(stackSize);
}

rule__ProblemSpec__ProblemPartsAssignment_6
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getProblemSpecAccess().getProblemPartsProblemPartSpecifierParserRuleCall_6_0()); }
ruleProblemPartSpecifier
{ after(grammarAccess.getProblemSpecAccess().getProblemPartsProblemPartSpecifierParserRuleCall_6_0()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__GoalSpec__RefinementsAssignment_2
@init {
int stackSize = keepStackSize();
Expand Down Expand Up @@ -19837,6 +20045,21 @@ finally {
restoreStackSize(stackSize);
}

rule__ProblemPartSpecifier__ProblemPartSpecifierAssignment_4
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getProblemPartSpecifierAccess().getProblemPartSpecifierURLTerminalRuleCall_4_0()); }
RULE_URL
{ after(grammarAccess.getProblemPartSpecifierAccess().getProblemPartSpecifierURLTerminalRuleCall_4_0()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__RulegenSpec__NodeSpecAssignment_2_0
@init {
int stackSize = keepStackSize();
Expand Down
Loading