From 014fdbf1f266193514e9960eafbd574637b45f67 Mon Sep 17 00:00:00 2001
From: "Bernhard J. Berger" <bernhard.berger@uni-bremen.de>
Date: Thu, 20 Apr 2023 20:50:05 +0200
Subject: [PATCH] EvoAl is compilable. #23 #24 #25
---
.../ea/fitness/DensityBasedFitness.java | 2 +-
.../src/main/java/module-info.java | 1 +
.../test/resources/simple/specification.ddl | 14 +++---
.../ea/api/initial/InitialPopulation.java | 2 +-
.../core/ea/main/alterer/AltererFactory.java | 2 +-
.../core/ea/main/codec/DynamicCodec.java | 4 +-
.../ea/main/codec/DynamicCodecProducer.java | 4 +-
.../DynamicBoundedDoubleChromosome.java | 2 +-
.../DynamicBoundedIntegerChromosome.java | 2 +-
.../codec/chromosome/DynamicChromosome.java | 6 +--
.../chromosome/DynamicChromosomeFactory.java | 2 +-
.../chromosome/DynamicScaledChromosome.java | 8 +--
.../ea/main/comparator/ParetoComparator.java | 2 +-
.../JeneticsConstraintProducer.java | 4 +-
.../core/ea/main/fitness/DistanceFitness.java | 5 +-
.../core/ea/main/fitness/FitnessFactory.java | 2 +-
.../ea/main/producer/SelectorFactory.java | 2 +-
.../search/EvolutionaryAlgorithmSearch.java | 12 ++---
.../src/main/java/module-info.java | 2 +-
src/core/de.evoal.core.junit/pom.xml | 4 +-
src/core/de.evoal.core.main/pom.xml | 4 +-
.../calculation/CalculationFactory.java | 2 +-
.../calculation/CalculationStrategy.java | 2 +-
.../constraints/model/DataConstraints.java | 2 +-
.../strategies/RepairStrategy.java | 2 +-
.../InitialCandidatesProvider.java | 2 +-
.../optimisation/OptimisationAlgorithm.java | 2 +-
.../optimisation/OptimisationFunction.java | 2 +-
.../OptimisationFunctionDecorator.java | 3 +-
.../OptimisationValueComparator.java | 2 +-
.../AbstractCandidateStatisticsWriter.java | 2 +-
.../statistics/writer/StatisticsWriter.java | 2 +-
.../evoal/core/api/utils/ConstantSwitch.java | 6 +--
.../evoal/core/api/utils/LanguageHelper.java | 14 +++---
.../comparator/WeightedSumComparator.java | 11 ++--
.../constraint/ConstraintProducer.java | 9 ++--
.../constraint/ast/BoundaryIdentifier.java | 2 +-
.../constraint/ast/ConditionConverter.java | 6 +--
.../ast/UnaryBoundaryIdentifier.java | 6 +--
.../calculations/NormalCalculation.java | 2 +-
.../StandardDeviationCalculation.java | 2 +-
.../constraint/RandomGenotypeStrategy.java | 2 +-
.../fitness/MalusFunctionProducer.java | 4 +-
.../internal/MalusForFitnessFunction.java | 2 +-
.../constraint/utils/ConfigurationUtils.java | 4 +-
.../correlation/CorrelationsProducer.java | 4 +-
.../constraints/correlation/el/AstHelper.java | 2 +-
.../correlation/el/RangeSwitch.java | 8 +--
.../deviation/DeviationProducer.java | 4 +-
.../core/main/constraints/el/CallSwitch.java | 6 +--
.../constraints/el/DataReferenceSwitch.java | 6 +--
.../core/main/constraints/el/ElHelper.java | 4 +-
.../core/main/constraints/el/LogHelper.java | 2 +-
.../main/constraints/el/NumberSwitch.java | 6 +--
.../main/constraints/el/StringSwitch.java | 6 +--
.../constraints/el/ValueReferenceSwitch.java | 6 +--
.../initial/InitialCandidatesFactory.java | 2 +-
.../main/initial/RandomInitialCandidates.java | 2 +-
.../core/main/initial/RandomProducer.java | 2 +-
.../main/producer/ComparatorProducer.java | 2 +-
.../producer/ConfigurationValueProducer.java | 15 +++---
.../OptimisationFunctionProducer.java | 6 +--
.../main/producer/SpecificationProducer.java | 6 +--
.../search/HeuristicSearchEvaluation.java | 2 +-
.../core/main/search/HeuristicSearchMain.java | 2 +-
.../main/statistics/StatisticsFactory.java | 4 +-
.../fitness/BestCandidateStatistics.java | 2 +-
.../individuals/IndividualStatistics.java | 2 +-
.../internal/MultipleStatisticsWriter.java | 2 +-
.../main/statistics/nop/NopStatistics.java | 2 +-
.../src/main/java/module-info.java | 4 +-
.../utils/LanguageHelperRegressionTest.java | 12 ++---
.../api/utils/LanguageHelperUnitTest.java | 11 ++--
.../core/api/utils/LanguageHelperTest.dl | 12 -----
.../core/api/utils/LanguageHelperTest.ol | 4 +-
.../de/evoal/core/api/utils/definitions.dl | 14 ++++++
.../core/api/utils/regressions/generator.dl | 50 ++++++++++---------
.../api/utils/regressions/shekel.generator | 8 +--
.../evoal/core/api/utils/regressions/test.ddl | 8 +--
src/core/de.evoal.core.plugin/pom.xml | 4 +-
.../generator/main/benchmarks/Rastrigin.java | 6 +--
.../cdi/BenchmarkOptimisationFunction.java | 6 +--
.../cdi/GeneratorConfigurationProducer.java | 8 +--
.../main/functions/ConstantFunction.java | 7 +--
.../MultivariateNormalDistribution.java | 7 ++-
.../MultivariateUniformDistribution.java | 10 ++--
.../main/generators/NormalDistribution.java | 8 +--
.../main/generators/UniformDistribution.java | 5 +-
.../main/utils/ConfigurationHelper.java | 4 +-
.../src/main/java/module-info.java | 5 +-
src/core/de.evoal.releng.parent/pom.xml | 13 ++---
.../api/configuration/Parameter.java | 6 +--
.../main/cdi/MLLConfigurationProducer.java | 8 +--
.../main/ea/SurrogateFitnessFunction.java | 2 +-
.../main/ea/TrainingInitialCandidates.java | 2 +-
.../surrogate/main/ea/TrainingProducer.java | 2 +-
.../main/ea/TrainingRepairStrategy.java | 2 +-
.../main/internal/StatementExecutor.java | 4 +-
.../constraint/ConstraintStatistics.java | 2 +-
.../GenerationStatisticsWriter.java | 2 +-
.../ranged/GenerationStatisticsWriter.java | 2 +-
.../src/main/java/module-info.java | 5 +-
.../evoal/surrogate/ws/WebServiceFitness.java | 9 ++--
.../src/main/java/module-info.java | 1 +
104 files changed, 271 insertions(+), 266 deletions(-)
delete mode 100644 src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/LanguageHelperTest.dl
create mode 100644 src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/definitions.dl
diff --git a/src/core/de.evoal.approximative.density/src/main/java/de/evoal/approximative/density/ea/fitness/DensityBasedFitness.java b/src/core/de.evoal.approximative.density/src/main/java/de/evoal/approximative/density/ea/fitness/DensityBasedFitness.java
index b8f5410d..3d2eecb2 100644
--- a/src/core/de.evoal.approximative.density/src/main/java/de/evoal/approximative/density/ea/fitness/DensityBasedFitness.java
+++ b/src/core/de.evoal.approximative.density/src/main/java/de/evoal/approximative/density/ea/fitness/DensityBasedFitness.java
@@ -8,7 +8,7 @@ import de.evoal.core.api.properties.info.PropertiesRanges;
import de.evoal.core.api.utils.LanguageHelper;
import de.evoal.core.api.utils.Requirements;
import de.evoal.core.api.optimisation.OptimisationFunctionDecorator;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import de.evoal.surrogate.api.configuration.PartialFunctionConfiguration;
import de.evoal.surrogate.api.function.FunctionCombiner;
import de.evoal.surrogate.api.function.PartialSurrogateFunction;
diff --git a/src/core/de.evoal.approximative.density/src/main/java/module-info.java b/src/core/de.evoal.approximative.density/src/main/java/module-info.java
index ff9fde44..90b86f8a 100644
--- a/src/core/de.evoal.approximative.density/src/main/java/module-info.java
+++ b/src/core/de.evoal.approximative.density/src/main/java/module-info.java
@@ -13,6 +13,7 @@ module de.evoal.approximative.density {
requires smile.math;
requires de.evoal.core.ea;
+ requires de.evoal.languages.model.base;
opens de.evoal.approximative.density.ea.fitness to weld.core.impl;
opens de.evoal.approximative.density.ea.surrogate.gof to weld.core.impl;
diff --git a/src/core/de.evoal.core.arff/src/test/resources/simple/specification.ddl b/src/core/de.evoal.core.arff/src/test/resources/simple/specification.ddl
index c41e1b63..907eb96e 100644
--- a/src/core/de.evoal.core.arff/src/test/resources/simple/specification.ddl
+++ b/src/core/de.evoal.core.arff/src/test/resources/simple/specification.ddl
@@ -1,6 +1,8 @@
-data:
- cardinal real data 'sepallength';
- cardinal real data 'sepalwidth';
- cardinal real data 'petallength';
- cardinal real data 'petalwidth';
- nominal string data 'class';
\ No newline at end of file
+module simple.specification {
+ data:
+ cardinal real data 'sepallength';
+ cardinal real data 'sepalwidth';
+ cardinal real data 'petallength';
+ cardinal real data 'petalwidth';
+ nominal string data 'class';
+}
\ No newline at end of file
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/api/initial/InitialPopulation.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/api/initial/InitialPopulation.java
index 55c48236..52cbd25d 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/api/initial/InitialPopulation.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/api/initial/InitialPopulation.java
@@ -1,6 +1,6 @@
package de.evoal.core.ea.api.initial;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import io.jenetics.Gene;
import io.jenetics.engine.Engine;
import io.jenetics.engine.EvolutionStream;
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/alterer/AltererFactory.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/alterer/AltererFactory.java
index 34e06c1e..9d919d0f 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/alterer/AltererFactory.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/alterer/AltererFactory.java
@@ -10,7 +10,7 @@ import de.evoal.core.ea.main.alterer.crossover.*;
import de.evoal.core.ea.main.alterer.mutator.SingleBitFlipCorrelationMutator;
import de.evoal.core.ea.main.alterer.mutator.SwapCorrelationMutator;
import de.evoal.core.api.correlations.Correlations;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import de.evoal.core.api.utils.LanguageHelper;
import io.jenetics.*;
import io.jenetics.util.Mean;
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/DynamicCodec.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/DynamicCodec.java
index 714bce24..cdf93f3d 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/DynamicCodec.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/DynamicCodec.java
@@ -6,8 +6,8 @@ import de.evoal.core.api.properties.Properties;
import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.core.ea.main.codec.chromosome.DynamicChromosome;
import de.evoal.core.ea.main.codec.chromosome.DynamicChromosomeFactory;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Instance;
import io.jenetics.Chromosome;
import io.jenetics.Gene;
import io.jenetics.Genotype;
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/DynamicCodecProducer.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/DynamicCodecProducer.java
index e8abb952..32d5f7b0 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/DynamicCodecProducer.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/DynamicCodecProducer.java
@@ -3,8 +3,8 @@ package de.evoal.core.ea.main.codec;
import de.evoal.core.api.board.CoreBlackboardEntries;
import de.evoal.core.api.cdi.ConfigurationValue;
import de.evoal.core.api.properties.PropertiesSpecification;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Instance;
import lombok.extern.slf4j.Slf4j;
import javax.enterprise.context.ApplicationScoped;
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicBoundedDoubleChromosome.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicBoundedDoubleChromosome.java
index 6775e82c..bb3d2d96 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicBoundedDoubleChromosome.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicBoundedDoubleChromosome.java
@@ -3,7 +3,7 @@ package de.evoal.core.ea.main.codec.chromosome;
import de.evoal.core.api.properties.PropertySpecification;
import de.evoal.core.api.properties.info.PropertiesBoundaries;
import de.evoal.languages.model.ddl.DataDescription;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import io.jenetics.util.DoubleRange;
import javax.inject.Inject;
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicBoundedIntegerChromosome.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicBoundedIntegerChromosome.java
index 18a9b497..ea019494 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicBoundedIntegerChromosome.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicBoundedIntegerChromosome.java
@@ -3,7 +3,7 @@ package de.evoal.core.ea.main.codec.chromosome;
import de.evoal.core.api.properties.PropertySpecification;
import de.evoal.core.api.properties.info.PropertiesBoundaries;
import de.evoal.languages.model.ddl.DataDescription;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import io.jenetics.util.IntRange;
import javax.inject.Inject;
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicChromosome.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicChromosome.java
index aae68706..9233373c 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicChromosome.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicChromosome.java
@@ -4,10 +4,10 @@ import de.evoal.core.api.properties.Properties;
import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.core.api.properties.PropertySpecification;
import de.evoal.languages.model.ddl.DataDescription;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Attribute;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Attribute;
import de.evoal.languages.model.instance.DataReference;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import io.jenetics.Chromosome;
import org.apache.commons.math3.util.Pair;
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicChromosomeFactory.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicChromosomeFactory.java
index 8a38301c..e0c391d2 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicChromosomeFactory.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicChromosomeFactory.java
@@ -1,7 +1,7 @@
package de.evoal.core.ea.main.codec.chromosome;
import de.evoal.core.api.cdi.BeanFactory;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import javax.enterprise.context.ApplicationScoped;
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicScaledChromosome.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicScaledChromosome.java
index 950267d2..fbf96650 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicScaledChromosome.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/codec/chromosome/DynamicScaledChromosome.java
@@ -2,9 +2,9 @@ package de.evoal.core.ea.main.codec.chromosome;
import de.evoal.core.api.utils.Requirements;
import de.evoal.languages.model.ddl.DataDescription;
-import de.evoal.languages.model.el.IntegerLiteral;
-import de.evoal.languages.model.instance.Instance;
-import de.evoal.languages.model.instance.LiteralValue;
+import de.evoal.languages.model.base.IntegerLiteral;
+import de.evoal.languages.model.base.Instance;
+import de.evoal.languages.model.base.Literal;
import io.jenetics.util.DoubleRange;
public abstract class DynamicScaledChromosome extends DynamicBoundedDoubleChromosome {
@@ -16,7 +16,7 @@ public abstract class DynamicScaledChromosome extends DynamicBoundedDoubleChromo
Requirements.requireSize(dataRepresented, 1);
Requirements.requireSize(ranges, 1);
- scale = ((IntegerLiteral)((LiteralValue)specification.findAttribute("scale").getValue()).getLiteral()).getValue();
+ scale = ((IntegerLiteral)specification.findAttribute("scale")).getValue();
}
protected DoubleRange toRange(final DataDescription dataDescription) {
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/comparator/ParetoComparator.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/comparator/ParetoComparator.java
index 5c955ff5..f51a3093 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/comparator/ParetoComparator.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/comparator/ParetoComparator.java
@@ -2,7 +2,7 @@ package de.evoal.core.ea.main.comparator;
import de.evoal.core.api.optimisation.OptimisationValueComparator;
import de.evoal.core.api.optimisation.OptimisationValue;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import javax.enterprise.context.ApplicationScoped;
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/constraint/JeneticsConstraintProducer.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/constraint/JeneticsConstraintProducer.java
index 067de505..28dda096 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/constraint/JeneticsConstraintProducer.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/constraint/JeneticsConstraintProducer.java
@@ -13,7 +13,7 @@ import de.evoal.core.ea.api.codec.CustomCodec;
import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.core.api.utils.LanguageHelper;
import de.evoal.core.main.constraints.constraint.utils.ConfigurationUtils;
-import de.evoal.languages.model.instance.*;
+import de.evoal.languages.model.base.*;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
@@ -36,7 +36,7 @@ public class JeneticsConstraintProducer {
// collect group information to handle
final List<Instance> groups = ConfigurationUtils.findConstraintHandlerByHandlingStrategy(handlerConfigurations, "kill-at-birth");
- final Map<String, Instance> configurationMap = groups.stream().collect(Collectors.toMap(i -> (String)((LiteralValue)i.findAttribute("category").getValue()).getLiteral().getValue(), Function.identity()));
+ final Map<String, Instance> configurationMap = groups.stream().collect(Collectors.toMap(i -> (String)((Literal)i.findAttribute("category").getValue()).getValue(), Function.identity()));
final List<Constraint> listOfConstraints = constraints.getConstraints();
return listOfConstraints
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/fitness/DistanceFitness.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/fitness/DistanceFitness.java
index e241e1b9..39a0dd79 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/fitness/DistanceFitness.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/fitness/DistanceFitness.java
@@ -7,7 +7,8 @@ import de.evoal.core.api.optimisation.OptimisationFunctionDecorator;
import de.evoal.core.api.properties.Properties;
import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.core.api.utils.Requirements;
-import de.evoal.languages.model.instance.*;
+import de.evoal.languages.model.base.*;
+import de.evoal.languages.model.instance.DataReference;
import lombok.extern.slf4j.Slf4j;
import javax.enterprise.context.Dependent;
@@ -81,7 +82,7 @@ public class DistanceFitness extends OptimisationFunctionDecorator {
.map(Instance.class::cast)
.forEach(i -> {
final String name = ((DataReference)i.findAttribute("name").getValue()).getDefinition().getName();
- final Object value = ((LiteralValue)i.findAttribute("val").getValue()).getLiteral().getValue();
+ final Object value = ((Literal)i.findAttribute("val").getValue()).getValue();
properties.put(specification.indexOf(name), value);
});
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/fitness/FitnessFactory.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/fitness/FitnessFactory.java
index 4c55b5b1..699cdcf3 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/fitness/FitnessFactory.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/fitness/FitnessFactory.java
@@ -12,7 +12,7 @@ import de.evoal.core.api.optimisation.OptimisationFunction;
import de.evoal.core.api.optimisation.OptimisationValueComparator;
import de.evoal.core.api.optimisation.OptimisationValue;
import de.evoal.core.api.properties.Properties;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import lombok.extern.slf4j.Slf4j;
@ApplicationScoped
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/producer/SelectorFactory.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/producer/SelectorFactory.java
index 2b201bd1..629094c4 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/producer/SelectorFactory.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/producer/SelectorFactory.java
@@ -3,7 +3,7 @@ package de.evoal.core.ea.main.producer;
import de.evoal.core.api.board.CoreBlackboardEntries;
import de.evoal.core.api.cdi.ConfigurationValue;
import de.evoal.core.api.utils.LanguageHelper;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import io.jenetics.*;
import javax.enterprise.context.ApplicationScoped;
diff --git a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/search/EvolutionaryAlgorithmSearch.java b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/search/EvolutionaryAlgorithmSearch.java
index 0e1bfd47..9870a088 100644
--- a/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/search/EvolutionaryAlgorithmSearch.java
+++ b/src/core/de.evoal.core.ea/src/main/java/de/evoal/core/ea/main/search/EvolutionaryAlgorithmSearch.java
@@ -24,9 +24,9 @@ import de.evoal.core.ea.main.jenetics.ConstraintList;
import de.evoal.core.ea.main.alterer.AltererFactory;
import de.evoal.core.ea.main.codec.DynamicCodec;
import de.evoal.core.ea.main.statistics.JeneticsStatisticsWriter;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Attribute;
-import de.evoal.languages.model.instance.Value;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Attribute;
+import de.evoal.languages.model.base.Value;
import de.evoal.languages.model.ol.OptimisationModel;
import io.jenetics.*;
import io.jenetics.engine.*;
@@ -106,7 +106,7 @@ public class EvolutionaryAlgorithmSearch implements OptimisationAlgorithm {
private InitialCandidatesProvider provider;
@Override
- public OptimisationAlgorithm init(de.evoal.languages.model.instance.Instance instance) {
+ public OptimisationAlgorithm init(de.evoal.languages.model.base.Instance instance) {
return this;
}
@@ -147,7 +147,7 @@ public class EvolutionaryAlgorithmSearch implements OptimisationAlgorithm {
private void setup() {
final OptimisationModel configuration = board.get(CoreBlackboardEntries.OPTIMISATION_CONFIGURATION);
- final de.evoal.languages.model.instance.Instance alterers = LanguageHelper.lookup(configuration.getInstance(), "algorithm.alterers");
+ final de.evoal.languages.model.base.Instance alterers = LanguageHelper.lookup(configuration.getAlgorithm().getAlgorithm(), "alterers");
for(final Attribute category: alterers.getAttributes()) {
final String name = category.getDefinition().getName();
@@ -158,7 +158,7 @@ public class EvolutionaryAlgorithmSearch implements OptimisationAlgorithm {
for(final Value alterer : array.getValues()) {
this.alterers
.computeIfAbsent(name, k -> new ArrayList<>())
- .add(factory.create((de.evoal.languages.model.instance.Instance)alterer));
+ .add(factory.create((de.evoal.languages.model.base.Instance)alterer));
}
}
}
diff --git a/src/core/de.evoal.core.ea/src/main/java/module-info.java b/src/core/de.evoal.core.ea/src/main/java/module-info.java
index 0f09d6e0..8e399ed7 100644
--- a/src/core/de.evoal.core.ea/src/main/java/module-info.java
+++ b/src/core/de.evoal.core.ea/src/main/java/module-info.java
@@ -14,7 +14,7 @@ module de.evoal.core.ea {
requires org.eclipse.emf.common;
requires de.evoal.languages.model.ddl;
- requires de.evoal.languages.model.el;
+ requires de.evoal.languages.model.base;
requires de.evoal.languages.model.instance;
requires de.evoal.core.main;
diff --git a/src/core/de.evoal.core.junit/pom.xml b/src/core/de.evoal.core.junit/pom.xml
index c2754b4c..a7dc43db 100644
--- a/src/core/de.evoal.core.junit/pom.xml
+++ b/src/core/de.evoal.core.junit/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>de.evoal.languages</groupId>
- <artifactId>de.evoal.languages.model.el</artifactId>
+ <artifactId>de.evoal.languages.model.base</artifactId>
<version>${evoal.languages.version}</version>
<scope>compile</scope>
</dependency>
@@ -99,7 +99,7 @@
<dependency>
<groupId>de.evoal.languages</groupId>
- <artifactId>de.evoal.languages.model.el.dsl</artifactId>
+ <artifactId>de.evoal.languages.model.base.dsl</artifactId>
<version>${evoal.languages.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/src/core/de.evoal.core.main/pom.xml b/src/core/de.evoal.core.main/pom.xml
index b0ed4fc7..2ec54d7a 100644
--- a/src/core/de.evoal.core.main/pom.xml
+++ b/src/core/de.evoal.core.main/pom.xml
@@ -156,7 +156,7 @@
<dependency>
<groupId>de.evoal.languages</groupId>
- <artifactId>de.evoal.languages.model.el</artifactId>
+ <artifactId>de.evoal.languages.model.base</artifactId>
<version>${evoal.languages.version}</version>
<scope>compile</scope>
</dependency>
@@ -199,7 +199,7 @@
<dependency>
<groupId>de.evoal.languages</groupId>
- <artifactId>de.evoal.languages.model.el.dsl</artifactId>
+ <artifactId>de.evoal.languages.model.base.dsl</artifactId>
<version>${evoal.languages.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/calculation/CalculationFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/calculation/CalculationFactory.java
index c932a9a2..d84c62d0 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/calculation/CalculationFactory.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/calculation/CalculationFactory.java
@@ -7,7 +7,7 @@ import de.evoal.core.api.cdi.ConfigurationValue;
import javax.enterprise.context.ApplicationScoped;
import de.evoal.core.api.utils.LanguageHelper;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import javax.inject.Inject;
import java.util.Arrays;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/calculation/CalculationStrategy.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/calculation/CalculationStrategy.java
index 5ddbce8b..004065f8 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/calculation/CalculationStrategy.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/calculation/CalculationStrategy.java
@@ -3,7 +3,7 @@ package de.evoal.core.api.constraints.calculation;
import de.evoal.core.api.constraints.strategies.CalculationResult;
import de.evoal.core.api.constraints.model.Constraint;
import de.evoal.core.api.properties.Properties;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import lombok.NonNull;
/**
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/model/DataConstraints.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/model/DataConstraints.java
index e4005f5e..d35b0f48 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/model/DataConstraints.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/model/DataConstraints.java
@@ -3,7 +3,7 @@ package de.evoal.core.api.constraints.model;
import de.evoal.languages.model.ddl.DataDescription;
import de.evoal.languages.model.ddl.DataDescriptionModel;
import de.evoal.languages.model.ddl.TypedDataDescription;
-import de.evoal.languages.model.el.Expression;
+import de.evoal.languages.model.base.Expression;
import org.apache.commons.math3.util.Pair;
import java.util.*;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/strategies/RepairStrategy.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/strategies/RepairStrategy.java
index cb025199..360bffe0 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/strategies/RepairStrategy.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/constraints/strategies/RepairStrategy.java
@@ -1,7 +1,7 @@
package de.evoal.core.api.constraints.strategies;
import de.evoal.core.api.properties.Properties;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
/**
* Repair strategy used by kill-at-birth.
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/InitialCandidatesProvider.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/InitialCandidatesProvider.java
index eb3f37eb..98638f05 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/InitialCandidatesProvider.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/InitialCandidatesProvider.java
@@ -1,7 +1,7 @@
package de.evoal.core.api.optimisation;
import de.evoal.core.api.properties.Properties;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import java.util.stream.Stream;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationAlgorithm.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationAlgorithm.java
index 3f9fe2c2..47ea9e90 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationAlgorithm.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationAlgorithm.java
@@ -1,6 +1,6 @@
package de.evoal.core.api.optimisation;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
/**
* Interface for all optimisation algorithms.
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationFunction.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationFunction.java
index 759f4b6d..ef5f8641 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationFunction.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationFunction.java
@@ -1,7 +1,7 @@
package de.evoal.core.api.optimisation;
import de.evoal.core.api.properties.Properties;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import java.util.function.Function;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationFunctionDecorator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationFunctionDecorator.java
index 25fa8e46..dd426ec4 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationFunctionDecorator.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationFunctionDecorator.java
@@ -1,8 +1,7 @@
package de.evoal.core.api.optimisation;
import de.evoal.core.api.cdi.BeanFactory;
-import de.evoal.core.api.optimisation.OptimisationFunction;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
public abstract class OptimisationFunctionDecorator implements OptimisationFunction {
protected OptimisationFunction decoratedFunction;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationValueComparator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationValueComparator.java
index ff96edd7..f8ca53bf 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationValueComparator.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/optimisation/OptimisationValueComparator.java
@@ -1,6 +1,6 @@
package de.evoal.core.api.optimisation;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import java.util.function.Function;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/writer/AbstractCandidateStatisticsWriter.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/writer/AbstractCandidateStatisticsWriter.java
index 238018e1..e89049b2 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/writer/AbstractCandidateStatisticsWriter.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/writer/AbstractCandidateStatisticsWriter.java
@@ -5,7 +5,7 @@ import de.evoal.core.api.statistics.IterationResult;
import de.evoal.core.api.statistics.io.Writer;
import de.evoal.core.api.statistics.io.WriterException;
import de.evoal.core.api.statistics.io.WriterStrategy;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/writer/StatisticsWriter.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/writer/StatisticsWriter.java
index e5b5affa..fdbe820b 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/writer/StatisticsWriter.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/writer/StatisticsWriter.java
@@ -1,7 +1,7 @@
package de.evoal.core.api.statistics.writer;
import de.evoal.core.api.statistics.IterationResult;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
/**
* Evaluation-specific data writer for evaluation results. The information
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/ConstantSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/ConstantSwitch.java
index 7c7fcb5b..e23ea035 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/ConstantSwitch.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/ConstantSwitch.java
@@ -1,12 +1,12 @@
package de.evoal.core.api.utils;
-import de.evoal.languages.model.el.*;
-import de.evoal.languages.model.el.util.ELSwitch;
+import de.evoal.languages.model.base.*;
+import de.evoal.languages.model.base.util.BaseSwitch;
import java.util.Objects;
-public class ConstantSwitch extends ELSwitch<Object> {
+public class ConstantSwitch extends BaseSwitch<Object> {
private ConstantSwitch() {
}
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/LanguageHelper.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/LanguageHelper.java
index 41a8bd83..d26a3336 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/LanguageHelper.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/LanguageHelper.java
@@ -1,8 +1,8 @@
package de.evoal.core.api.utils;
import de.evoal.languages.model.dl.*;
-import de.evoal.languages.model.el.BooleanLiteral;
-import de.evoal.languages.model.instance.*;
+import de.evoal.languages.model.base.BooleanLiteral;
+import de.evoal.languages.model.base.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -83,7 +83,7 @@ public final class LanguageHelper {
}
private static Object convertToJava(final Object current, final Type type) {
- if(current instanceof LiteralValue) {
+ if(current instanceof Literal) {
return readLiteral(current, type);
} else if(current instanceof Array) {
return readArray(current, type);
@@ -103,14 +103,14 @@ public final class LanguageHelper {
private static Object readLiteral(final Object current, final Type type) {
if(type instanceof FloatType) {
- return ((Number)((LiteralValue)current).getLiteral().getValue()).doubleValue();
+ return ((Number)((Literal)current).getValue()).doubleValue();
} else if(type instanceof IntType) {
- return ((Number)((LiteralValue)current).getLiteral().getValue()).intValue();
+ return ((Number)((Literal)current).getValue()).intValue();
} else if(type instanceof StringType) {
- return Objects.toString(((LiteralValue)current).getLiteral().getValue());
+ return Objects.toString(((Literal)current).getValue());
} else if(type instanceof BooleanType) {
// TODO Fix hard call to is value
- return Boolean.TRUE.equals(((BooleanLiteral)((LiteralValue)current).getLiteral()).isValue());
+ return Boolean.TRUE.equals(((Literal)((Literal)current)).getValue());
}
throw new UnsupportedOperationException("Type " + type.toString() + " is not supported.");
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/comparator/WeightedSumComparator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/comparator/WeightedSumComparator.java
index 4479daef..4770d415 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/comparator/WeightedSumComparator.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/comparator/WeightedSumComparator.java
@@ -2,10 +2,10 @@ package de.evoal.core.main.comparator;
import de.evoal.core.api.optimisation.OptimisationValueComparator;
import de.evoal.core.api.optimisation.OptimisationValue;
-import de.evoal.languages.model.el.DoubleLiteral;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Instance;
-import de.evoal.languages.model.instance.LiteralValue;
+import de.evoal.languages.model.base.DoubleLiteral;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Instance;
+import de.evoal.languages.model.base.Literal;
import javax.enterprise.context.Dependent;
import javax.inject.Named;
@@ -27,8 +27,7 @@ public class WeightedSumComparator implements OptimisationValueComparator {
this.weights = weights.getValues()
.stream()
- .map(LiteralValue.class::cast)
- .map(LiteralValue::getLiteral)
+ .map(Literal.class::cast)
.map(DoubleLiteral.class::cast)
.mapToDouble(DoubleLiteral::getValue)
.toArray();
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ConstraintProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ConstraintProducer.java
index f13afa2f..cbd90a96 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ConstraintProducer.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ConstraintProducer.java
@@ -13,10 +13,11 @@ import javax.inject.Named;
import de.evoal.core.main.constraints.constraint.ast.ConditionConverter;
import de.evoal.core.main.constraints.el.ElHelper;
import de.evoal.core.main.constraints.el.LogHelper;
+import de.evoal.languages.model.base.DefinedFunctionName;
import de.evoal.languages.model.ddl.DataDescription;
-import de.evoal.languages.model.ddl.FunctionName;
-import de.evoal.languages.model.el.Call;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.FunctionName;
+import de.evoal.languages.model.base.Call;
+import de.evoal.languages.model.base.Instance;
import lombok.extern.slf4j.Slf4j;
import java.util.Objects;
@@ -48,7 +49,7 @@ public class ConstraintProducer {
.map(ElHelper::findCall)
.filter(Objects::nonNull)
.map(Call.class::cast)
- .filter(c -> "constraint".equals(((FunctionName)c.getFunction()).getDefinition().getName()))
+ .filter(c -> "constraint".equals(((DefinedFunctionName)c.getFunction()).getDefinition().getName()))
.map(c -> convert(c, context))
.filter(Optional::isPresent)
.map(Optional::get)
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/BoundaryIdentifier.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/BoundaryIdentifier.java
index 0e8f078d..d62f33cd 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/BoundaryIdentifier.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/BoundaryIdentifier.java
@@ -5,7 +5,7 @@ import de.evoal.core.api.properties.PropertySpecification;
import de.evoal.core.api.properties.info.PropertiesBoundaries;
import de.evoal.languages.model.ddl.DataDescription;
import de.evoal.languages.model.ddl.RepresentationType;
-import de.evoal.languages.model.el.*;
+import de.evoal.languages.model.base.*;
import lombok.extern.slf4j.Slf4j;
import java.util.*;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/ConditionConverter.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/ConditionConverter.java
index f0634500..bee5f980 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/ConditionConverter.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/ConditionConverter.java
@@ -10,15 +10,15 @@ import de.evoal.core.main.constraints.constraint.utils.ArithmeticNumberOperation
import de.evoal.languages.model.ddl.DataDescription;
import de.evoal.languages.model.ddl.DataReference;
import de.evoal.languages.model.ddl.SelfReference;
-import de.evoal.languages.model.el.*;
-import de.evoal.languages.model.el.util.ELSwitch;
+import de.evoal.languages.model.base.*;
+import de.evoal.languages.model.base.util.BaseSwitch;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.BiFunction;
-public class ConditionConverter extends ELSwitch<Object> {
+public class ConditionConverter extends BaseSwitch<Object> {
private BiFunction<Properties, Properties, Object> function;
private final List<PropertySpecification> usedProperties = new ArrayList<>();
private final PropertiesSpecification genoSpec;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/UnaryBoundaryIdentifier.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/UnaryBoundaryIdentifier.java
index 8f5b7e87..d1a096e7 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/UnaryBoundaryIdentifier.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/ast/UnaryBoundaryIdentifier.java
@@ -4,12 +4,12 @@ import de.evoal.core.api.utils.Requirements;
import de.evoal.languages.model.ddl.DataDescription;
import de.evoal.languages.model.ddl.DataReference;
import de.evoal.languages.model.ddl.SelfReference;
-import de.evoal.languages.model.el.*;
-import de.evoal.languages.model.el.util.ELSwitch;
+import de.evoal.languages.model.base.*;
+import de.evoal.languages.model.base.util.BaseSwitch;
import lombok.extern.slf4j.Slf4j;
@Slf4j
-public class UnaryBoundaryIdentifier extends ELSwitch<Object> {
+public class UnaryBoundaryIdentifier extends BaseSwitch<Object> {
private final DataDescription context;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/calculations/NormalCalculation.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/calculations/NormalCalculation.java
index 52a128b0..bab3b09f 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/calculations/NormalCalculation.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/calculations/NormalCalculation.java
@@ -6,7 +6,7 @@ import de.evoal.core.api.constraints.calculation.CalculationStrategy;
import de.evoal.core.api.properties.Properties;
import javax.enterprise.context.Dependent;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import lombok.NonNull;
import javax.inject.Named;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/calculations/StandardDeviationCalculation.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/calculations/StandardDeviationCalculation.java
index c0f5f83c..8c1505f8 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/calculations/StandardDeviationCalculation.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/calculations/StandardDeviationCalculation.java
@@ -12,7 +12,7 @@ import javax.enterprise.context.Dependent;
import de.evoal.core.main.constraints.constraint.utils.ArithmeticNumberOperations;
import de.evoal.core.main.constraints.deviation.model.Deviations;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import lombok.NonNull;
import org.apache.commons.math3.util.Pair;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/constraint/RandomGenotypeStrategy.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/constraint/RandomGenotypeStrategy.java
index 23ae42e7..47d01377 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/constraint/RandomGenotypeStrategy.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/constraint/RandomGenotypeStrategy.java
@@ -4,7 +4,7 @@ import de.evoal.core.api.constraints.strategies.RepairStrategy;
import de.evoal.core.api.optimisation.InitialCandidatesProvider;
import de.evoal.core.api.properties.Properties;
import de.evoal.core.main.initial.RandomInitialCandidates;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import javax.enterprise.context.Dependent;
import javax.inject.Inject;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/fitness/MalusFunctionProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/fitness/MalusFunctionProducer.java
index 2117bff8..1bb3ed32 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/fitness/MalusFunctionProducer.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/fitness/MalusFunctionProducer.java
@@ -17,7 +17,7 @@ import javax.enterprise.inject.Produces;
import de.evoal.core.main.constraints.constraint.strategies.fitness.internal.MalusForFitnessFunction;
import de.evoal.core.main.constraints.constraint.utils.ConfigurationUtils;
-import de.evoal.languages.model.instance.*;
+import de.evoal.languages.model.base.*;
import org.apache.commons.math3.util.Pair;
import javax.inject.Named;
@@ -38,7 +38,7 @@ public class MalusFunctionProducer {
final List<Instance> relevantHandlers = ConfigurationUtils.findConstraintHandlerByHandlingStrategy(handlers, "malus-for-fitness");
// collect group names of relevant handlers
- final Set<String> allGroups = relevantHandlers.stream().map(i -> (String)((LiteralValue)i.findAttribute("category").getValue()).getLiteral().getValue()).collect(Collectors.toSet());
+ final Set<String> allGroups = relevantHandlers.stream().map(i -> (String)((Literal)i.findAttribute("category").getValue()).getValue()).collect(Collectors.toSet());
// resulting strategies
final MalusForFitnessStrategy resultingFunction = new MalusForFitnessStrategy(target.size());
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/fitness/internal/MalusForFitnessFunction.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/fitness/internal/MalusForFitnessFunction.java
index 7042c26a..033a1869 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/fitness/internal/MalusForFitnessFunction.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/strategies/fitness/internal/MalusForFitnessFunction.java
@@ -5,7 +5,7 @@ import de.evoal.core.api.constraints.model.ConstraintResult;
import de.evoal.core.api.constraints.strategies.fitness.MalusFunction;
import de.evoal.core.api.properties.Properties;
import de.evoal.core.api.utils.LanguageHelper;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
public class MalusForFitnessFunction implements MalusFunction {
private final Constraint constraint;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/utils/ConfigurationUtils.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/utils/ConfigurationUtils.java
index 02c89c14..58b428ab 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/utils/ConfigurationUtils.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/constraint/utils/ConfigurationUtils.java
@@ -1,8 +1,8 @@
package de.evoal.core.main.constraints.constraint.utils;
import de.evoal.core.api.utils.LanguageHelper;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Instance;
import java.util.Arrays;
import java.util.List;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/CorrelationsProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/CorrelationsProducer.java
index 7535797b..ac125abe 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/CorrelationsProducer.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/CorrelationsProducer.java
@@ -12,7 +12,7 @@ import de.evoal.core.main.constraints.correlation.el.AstHelper;
import de.evoal.core.main.constraints.el.ElHelper;
import de.evoal.core.main.constraints.el.LogHelper;
import de.evoal.languages.model.ddl.DataDescription;
-import de.evoal.languages.model.el.Call;
+import de.evoal.languages.model.base.Call;
import lombok.extern.slf4j.Slf4j;
import javax.inject.Named;
@@ -45,7 +45,7 @@ public class CorrelationsProducer {
.map(ElHelper::findCall)
.filter(Objects::nonNull)
.map(Call.class::cast)
- .filter(c -> "connection".equals(((de.evoal.languages.model.ddl.FunctionName)c.getFunction()).getDefinition().getName()))
+ .filter(c -> "connection".equals(((de.evoal.languages.model.base.DefinedFunctionName)c.getFunction()).getDefinition().getName()))
.map(c -> convert(c, context))
.filter(Optional::isPresent)
.map(Optional::get)
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/el/AstHelper.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/el/AstHelper.java
index e9d1d85c..13094e1c 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/el/AstHelper.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/el/AstHelper.java
@@ -4,7 +4,7 @@ import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.core.main.constraints.el.DataReferenceSwitch;
import de.evoal.core.api.correlations.Range;
import de.evoal.languages.model.ddl.DataDescription;
-import de.evoal.languages.model.el.Expression;
+import de.evoal.languages.model.base.Expression;
public final class AstHelper {
private AstHelper() {
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/el/RangeSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/el/RangeSwitch.java
index 29a0ea53..94a16406 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/el/RangeSwitch.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/correlation/el/RangeSwitch.java
@@ -2,12 +2,12 @@ package de.evoal.core.main.constraints.correlation.el;
import de.evoal.core.main.constraints.el.ElHelper;
import de.evoal.core.api.correlations.Range;
-import de.evoal.languages.model.el.*;
-import de.evoal.languages.model.el.util.ELSwitch;
+import de.evoal.languages.model.base.*;
+import de.evoal.languages.model.base.util.BaseSwitch;
import java.util.Objects;
-public class RangeSwitch extends ELSwitch<Range> {
+public class RangeSwitch extends BaseSwitch<Range> {
@Override
public Range caseOrExpression(final OrExpression object) {
Objects.equals(object.getSubExpressions().size(), 1);
@@ -97,7 +97,7 @@ public class RangeSwitch extends ELSwitch<Range> {
@Override
public Range caseCall(final Call object) {
- final de.evoal.languages.model.ol.FunctionName calledFunction = (de.evoal.languages.model.ol.FunctionName)object.getFunction();
+ final de.evoal.languages.model.base.DefinedFunctionName calledFunction = (de.evoal.languages.model.base.DefinedFunctionName)object.getFunction();
if(!"range".equals(calledFunction.getDefinition().getName())) {
throw new IllegalStateException("Searching for range but found: " + calledFunction.getDefinition().getName());
}
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/deviation/DeviationProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/deviation/DeviationProducer.java
index 90234038..c12e61dd 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/deviation/DeviationProducer.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/deviation/DeviationProducer.java
@@ -11,7 +11,7 @@ import de.evoal.core.main.constraints.deviation.model.Deviations;
import de.evoal.core.main.constraints.el.ElHelper;
import de.evoal.core.main.constraints.el.LogHelper;
import de.evoal.languages.model.ddl.DataDescription;
-import de.evoal.languages.model.el.Call;
+import de.evoal.languages.model.base.Call;
import lombok.extern.slf4j.Slf4j;
import java.util.Objects;
@@ -38,7 +38,7 @@ public class DeviationProducer {
.map(ElHelper::findCall)
.filter(Objects::nonNull)
.map(Call.class::cast)
- .filter(c -> "standardDeviation".equals(((de.evoal.languages.model.ddl.FunctionName)c.getFunction()).getDefinition().getName()))
+ .filter(c -> "standardDeviation".equals(((de.evoal.languages.model.base.DefinedFunctionName)c.getFunction()).getDefinition().getName()))
.map(c -> convert(c, context))
.filter(Optional::isPresent)
.map(Optional::get)
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/CallSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/CallSwitch.java
index 4ac65bb9..53f5fa6a 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/CallSwitch.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/CallSwitch.java
@@ -1,11 +1,11 @@
package de.evoal.core.main.constraints.el;
-import de.evoal.languages.model.el.*;
-import de.evoal.languages.model.el.util.ELSwitch;
+import de.evoal.languages.model.base.*;
+import de.evoal.languages.model.base.util.BaseSwitch;
import java.util.Objects;
-public class CallSwitch extends ELSwitch<Call> {
+public class CallSwitch extends BaseSwitch<Call> {
@Override
public Call caseOrExpression(final OrExpression object) {
Objects.equals(object.getSubExpressions().size(), 1);
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/DataReferenceSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/DataReferenceSwitch.java
index eb2174a9..45996b76 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/DataReferenceSwitch.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/DataReferenceSwitch.java
@@ -3,12 +3,12 @@ package de.evoal.core.main.constraints.el;
import de.evoal.languages.model.ddl.DataDescription;
import de.evoal.languages.model.ddl.DataReference;
import de.evoal.languages.model.ddl.SelfReference;
-import de.evoal.languages.model.el.*;
-import de.evoal.languages.model.el.util.ELSwitch;
+import de.evoal.languages.model.base.*;
+import de.evoal.languages.model.base.util.BaseSwitch;
import java.util.Objects;
-public class DataReferenceSwitch extends ELSwitch<DataDescription> {
+public class DataReferenceSwitch extends BaseSwitch<DataDescription> {
@Override
public DataDescription caseOrExpression(final OrExpression object) {
Objects.equals(object.getSubExpressions().size(), 1);
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/ElHelper.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/ElHelper.java
index 51dfe80a..7ff65c13 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/ElHelper.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/ElHelper.java
@@ -1,8 +1,8 @@
package de.evoal.core.main.constraints.el;
import de.evoal.languages.model.ddl.DataDescription;
-import de.evoal.languages.model.el.Call;
-import de.evoal.languages.model.el.Expression;
+import de.evoal.languages.model.base.Call;
+import de.evoal.languages.model.base.Expression;
public final class ElHelper {
private ElHelper() {
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/LogHelper.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/LogHelper.java
index fb8ef12c..2fefef68 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/LogHelper.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/LogHelper.java
@@ -1,7 +1,7 @@
package de.evoal.core.main.constraints.el;
import de.evoal.languages.model.ddl.dsl.DataDescriptionLanguageStandaloneSetup;
-import de.evoal.languages.model.el.Call;
+import de.evoal.languages.model.base.Call;
import org.eclipse.xtext.serializer.impl.Serializer;
import org.slf4j.Logger;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/NumberSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/NumberSwitch.java
index ac010f0b..f0270ff0 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/NumberSwitch.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/NumberSwitch.java
@@ -1,11 +1,11 @@
package de.evoal.core.main.constraints.el;
-import de.evoal.languages.model.el.*;
-import de.evoal.languages.model.el.util.ELSwitch;
+import de.evoal.languages.model.base.*;
+import de.evoal.languages.model.base.util.BaseSwitch;
import java.util.Objects;
-public class NumberSwitch extends ELSwitch<Number> {
+public class NumberSwitch extends BaseSwitch<Number> {
@Override
public Number caseOrExpression(final OrExpression object) {
Objects.equals(object.getSubExpressions().size(), 1);
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/StringSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/StringSwitch.java
index 592d35be..99e4b053 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/StringSwitch.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/StringSwitch.java
@@ -1,11 +1,11 @@
package de.evoal.core.main.constraints.el;
-import de.evoal.languages.model.el.*;
-import de.evoal.languages.model.el.util.ELSwitch;
+import de.evoal.languages.model.base.*;
+import de.evoal.languages.model.base.util.BaseSwitch;
import java.util.Objects;
-public class StringSwitch extends ELSwitch<String> {
+public class StringSwitch extends BaseSwitch<String> {
@Override
public String caseOrExpression(final OrExpression object) {
Objects.equals(object.getSubExpressions().size(), 1);
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/ValueReferenceSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/ValueReferenceSwitch.java
index 2c80bb6e..30a9fd61 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/ValueReferenceSwitch.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/constraints/el/ValueReferenceSwitch.java
@@ -4,12 +4,12 @@ import de.evoal.core.api.utils.Requirements;
import de.evoal.languages.model.ddl.DataDescription;
import de.evoal.languages.model.ddl.DataReference;
import de.evoal.languages.model.ddl.SelfReference;
-import de.evoal.languages.model.el.*;
-import de.evoal.languages.model.el.util.ELSwitch;
+import de.evoal.languages.model.base.*;
+import de.evoal.languages.model.base.util.BaseSwitch;
import java.util.Objects;
-public class ValueReferenceSwitch extends ELSwitch<String> {
+public class ValueReferenceSwitch extends BaseSwitch<String> {
private final DataDescription context;
public ValueReferenceSwitch(final DataDescription context) {
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/InitialCandidatesFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/InitialCandidatesFactory.java
index c9a77031..71b11699 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/InitialCandidatesFactory.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/InitialCandidatesFactory.java
@@ -4,7 +4,7 @@ import de.evoal.core.api.board.CoreBlackboardEntries;
import de.evoal.core.api.cdi.BeanFactory;
import de.evoal.core.api.cdi.ConfigurationValue;
import de.evoal.core.api.optimisation.InitialCandidatesProvider;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Produces;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/RandomInitialCandidates.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/RandomInitialCandidates.java
index 6b96d0f7..cb3de0a9 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/RandomInitialCandidates.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/RandomInitialCandidates.java
@@ -7,7 +7,7 @@ import de.evoal.core.api.properties.Properties;
import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.core.api.properties.PropertySpecification;
import de.evoal.core.api.properties.info.PropertiesBoundaries;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import lombok.extern.slf4j.Slf4j;
import javax.inject.Inject;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/RandomProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/RandomProducer.java
index 08bb3f5a..dd304d40 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/RandomProducer.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/initial/RandomProducer.java
@@ -4,7 +4,7 @@ import de.evoal.core.api.board.CoreBlackboardEntries;
import de.evoal.core.api.cdi.BeanFactory;
import de.evoal.core.api.cdi.ConfigurationValue;
import de.evoal.core.api.optimisation.InitialCandidatesProvider;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Dependent;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/ComparatorProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/ComparatorProducer.java
index 76207ab6..8c357109 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/ComparatorProducer.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/ComparatorProducer.java
@@ -4,7 +4,7 @@ import de.evoal.core.api.board.CoreBlackboardEntries;
import de.evoal.core.api.cdi.BeanFactory;
import de.evoal.core.api.cdi.ConfigurationValue;
import de.evoal.core.api.optimisation.OptimisationValueComparator;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Dependent;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/ConfigurationValueProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/ConfigurationValueProducer.java
index 591c6d53..5f5f402e 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/ConfigurationValueProducer.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/ConfigurationValueProducer.java
@@ -4,12 +4,12 @@ import de.evoal.core.api.board.Blackboard;
import de.evoal.core.api.board.CoreBlackboardEntries;
import de.evoal.core.api.cdi.ConfigurationValue;
import de.evoal.core.api.utils.LanguageHelper;
+import de.evoal.languages.model.base.Literal;
import de.evoal.languages.model.instance.DataReference;
import de.evoal.languages.model.ol.OptimisationModel;
-import de.evoal.languages.model.el.DoubleLiteral;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Instance;
-import de.evoal.languages.model.instance.LiteralValue;
+import de.evoal.languages.model.base.DoubleLiteral;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Instance;
import lombok.extern.slf4j.Slf4j;
import javax.enterprise.context.ApplicationScoped;
@@ -101,12 +101,15 @@ public class ConfigurationValueProducer {
return (ConfigurationValueProducer.<Array>lookup(board.get(value.entry()), value.access()))
.getValues()
.stream()
- .mapToDouble(x -> ((DoubleLiteral)(((LiteralValue)x).getLiteral())).getValue())
+ .mapToDouble(x -> ((DoubleLiteral)((Literal)x)).getValue())
.toArray();
}
private static <T> T lookup(final OptimisationModel model, final String access) {
log.info("Looking up configuration value {}", access);
- return LanguageHelper.lookup(model.getInstance(), access);
+
+ throw new RuntimeException("Implement lookup");
+
+ //return LanguageHelper.lookup(model.getInstance(), access);
}
}
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/OptimisationFunctionProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/OptimisationFunctionProducer.java
index 34fa1312..a38e5ea2 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/OptimisationFunctionProducer.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/OptimisationFunctionProducer.java
@@ -5,10 +5,10 @@ import de.evoal.core.api.cdi.BeanFactory;
import de.evoal.core.api.cdi.ConfigurationValue;
import de.evoal.core.api.optimisation.OptimisationFunction;
import de.evoal.core.api.properties.PropertiesSpecification;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Attribute;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Attribute;
import de.evoal.languages.model.instance.DataReference;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import lombok.extern.slf4j.Slf4j;
import javax.enterprise.context.ApplicationScoped;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/SpecificationProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/SpecificationProducer.java
index c0edffbc..f41e3afc 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/SpecificationProducer.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/SpecificationProducer.java
@@ -4,10 +4,10 @@ import de.evoal.core.api.board.CoreBlackboardEntries;
import de.evoal.core.api.cdi.ConfigurationValue;
import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.languages.model.ddl.DataDescription;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Attribute;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Attribute;
import de.evoal.languages.model.instance.DataReference;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Dependent;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchEvaluation.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchEvaluation.java
index 74e94493..9a7b3a71 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchEvaluation.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchEvaluation.java
@@ -11,7 +11,7 @@ import javax.enterprise.context.ApplicationScoped;
import de.evoal.core.api.statistics.writer.Column;
import de.evoal.core.api.statistics.writer.ColumnType;
import de.evoal.core.api.statistics.writer.WriterContext;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.math3.util.Pair;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchMain.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchMain.java
index 19f022d8..eb577989 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchMain.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchMain.java
@@ -12,7 +12,7 @@ import javax.enterprise.context.ApplicationScoped;
import de.evoal.core.api.optimisation.OptimisationAlgorithm;
import de.evoal.core.api.statistics.writer.ColumnType;
import de.evoal.core.api.statistics.writer.WriterContext;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import org.apache.commons.math3.util.Pair;
import javax.inject.Inject;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/StatisticsFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/StatisticsFactory.java
index dcde046a..d57a0e31 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/StatisticsFactory.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/StatisticsFactory.java
@@ -6,8 +6,8 @@ import de.evoal.core.api.cdi.ConfigurationValue;
import de.evoal.core.api.statistics.writer.StatisticsWriter;
import de.evoal.core.api.utils.Requirements;
import de.evoal.core.main.statistics.internal.MultipleStatisticsWriter;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Instance;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Dependent;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/fitness/BestCandidateStatistics.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/fitness/BestCandidateStatistics.java
index 47961377..aad2b0cb 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/fitness/BestCandidateStatistics.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/fitness/BestCandidateStatistics.java
@@ -13,7 +13,7 @@ import de.evoal.core.api.statistics.writer.AbstractCandidateStatisticsWriter;
import de.evoal.core.api.statistics.writer.Column;
import de.evoal.core.api.statistics.writer.ColumnType;
import de.evoal.core.api.statistics.writer.StatisticsWriter;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java
index c4473223..9a4da65e 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java
@@ -9,7 +9,7 @@ import de.evoal.core.api.statistics.writer.AbstractCandidateStatisticsWriter;
import de.evoal.core.api.statistics.writer.Column;
import de.evoal.core.api.statistics.writer.ColumnType;
import de.evoal.core.api.statistics.writer.StatisticsWriter;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import de.evoal.core.api.properties.Properties;
import de.evoal.core.api.properties.PropertiesSpecification;
import javax.annotation.PostConstruct;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/internal/MultipleStatisticsWriter.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/internal/MultipleStatisticsWriter.java
index 9046da28..959230fd 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/internal/MultipleStatisticsWriter.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/internal/MultipleStatisticsWriter.java
@@ -1,7 +1,7 @@
package de.evoal.core.main.statistics.internal;
import de.evoal.core.api.statistics.IterationResult;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import de.evoal.core.api.statistics.writer.StatisticsWriter;
import java.util.Arrays;
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/nop/NopStatistics.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/nop/NopStatistics.java
index 18c1b254..e503add1 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/nop/NopStatistics.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/nop/NopStatistics.java
@@ -1,7 +1,7 @@
package de.evoal.core.main.statistics.nop;
import de.evoal.core.api.statistics.IterationResult;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import de.evoal.core.api.statistics.writer.StatisticsWriter;
import javax.enterprise.context.Dependent;
diff --git a/src/core/de.evoal.core.main/src/main/java/module-info.java b/src/core/de.evoal.core.main/src/main/java/module-info.java
index 90141037..2d1027cd 100644
--- a/src/core/de.evoal.core.main/src/main/java/module-info.java
+++ b/src/core/de.evoal.core.main/src/main/java/module-info.java
@@ -24,14 +24,14 @@ module de.evoal.core.main {
requires org.eclipse.emf.ecore;
requires org.eclipse.xtext;
+ requires de.evoal.languages.model.base;
+ requires de.evoal.languages.model.base.dsl;
requires de.evoal.languages.model.ddl;
requires de.evoal.languages.model.ddl.dsl;
requires de.evoal.languages.model.dl;
requires de.evoal.languages.model.dl.dsl;
requires de.evoal.languages.model.ol;
requires de.evoal.languages.model.ol.dsl;
- requires de.evoal.languages.model.el;
- requires de.evoal.languages.model.el.dsl;
requires de.evoal.languages.model.instance;
requires de.evoal.languages.model.utils;
requires com.google.guice;
diff --git a/src/core/de.evoal.core.main/src/test/java/de/evoal/core/api/utils/LanguageHelperRegressionTest.java b/src/core/de.evoal.core.main/src/test/java/de/evoal/core/api/utils/LanguageHelperRegressionTest.java
index 85c45e0e..6a727174 100644
--- a/src/core/de.evoal.core.main/src/test/java/de/evoal/core/api/utils/LanguageHelperRegressionTest.java
+++ b/src/core/de.evoal.core.main/src/test/java/de/evoal/core/api/utils/LanguageHelperRegressionTest.java
@@ -2,10 +2,10 @@ package de.evoal.core.api.utils;
import de.evoal.core.junit.dsl.LanguageHelper;
import de.evoal.languages.model.dl.*;
-import de.evoal.languages.model.el.DoubleLiteral;
+import de.evoal.languages.model.base.DoubleLiteral;
import de.evoal.languages.model.generator.Configuration;
import de.evoal.languages.model.generator.Step;
-import de.evoal.languages.model.instance.*;
+import de.evoal.languages.model.base.*;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -82,10 +82,10 @@ public class LanguageHelperRegressionTest {
Assertions.assertTrue(attributeA.getValue() instanceof Array);
final Array array = (Array)attributeA.getValue();
Assertions.assertEquals(10, array.getValues().size());
- Assertions.assertTrue(array.getValues().get(0) instanceof LiteralValue);
- final LiteralValue literal = (LiteralValue) array.getValues().get(0);
- Assertions.assertTrue(literal.getLiteral() instanceof DoubleLiteral);
- Assertions.assertEquals(1.0, literal.getLiteral().getValue());
+ Assertions.assertTrue(array.getValues().get(0) instanceof Literal);
+ final Literal literal = (Literal) array.getValues().get(0);
+ Assertions.assertTrue(literal instanceof DoubleLiteral);
+ Assertions.assertEquals(1.0, literal.getValue());
}
{
diff --git a/src/core/de.evoal.core.main/src/test/java/de/evoal/core/api/utils/LanguageHelperUnitTest.java b/src/core/de.evoal.core.main/src/test/java/de/evoal/core/api/utils/LanguageHelperUnitTest.java
index e4724cc9..bbb3a76a 100644
--- a/src/core/de.evoal.core.main/src/test/java/de/evoal/core/api/utils/LanguageHelperUnitTest.java
+++ b/src/core/de.evoal.core.main/src/test/java/de/evoal/core/api/utils/LanguageHelperUnitTest.java
@@ -1,6 +1,6 @@
package de.evoal.core.api.utils;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import de.evoal.languages.model.ol.OptimisationModel;
import org.junit.jupiter.api.*;
@@ -11,11 +11,11 @@ public class LanguageHelperUnitTest {
@Test
public void testLoading() {
final OptimisationModel model = de.evoal.core.junit.dsl.LanguageHelper.loadFromClasspath("de/evoal/core/api/utils/LanguageHelperTest.ol");
- final Instance instance = model.getInstance();
-
- Assertions.assertNotNull(instance);
+// final Instance instance = model.getInstance();
+ // TODO FIXME
+// Assertions.assertNotNull(instance);
}
-
+/*
@Test
public void testLookupForNullInstance() {
Assertions.assertThrows(IllegalStateException.class, () -> lookup(null, "child"));
@@ -179,4 +179,5 @@ public class LanguageHelperUnitTest {
Assertions.assertEquals(42, array2[0]);
}
+ */
}
diff --git a/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/LanguageHelperTest.dl b/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/LanguageHelperTest.dl
deleted file mode 100644
index bde38ea5..00000000
--- a/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/LanguageHelperTest.dl
+++ /dev/null
@@ -1,12 +0,0 @@
-type 'parent' {
- child : instance A;
-}
-
-type A {
- 'float-field' : float;
- 'string-field' : string;
- 'integer-field' : int;
- 'boolean-field' : boolean;
- 'array-1D-float' : array float;
- 'array-2D-int' : array array int;
-}
\ No newline at end of file
diff --git a/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/LanguageHelperTest.ol b/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/LanguageHelperTest.ol
index 59094313..731d710f 100644
--- a/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/LanguageHelperTest.ol
+++ b/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/LanguageHelperTest.ol
@@ -1,5 +1,6 @@
-use "LanguageHelperTest.dl";
+import de.evoal.core.api.utils.regressions.definitions;
+declare
parent {
child := A {
'boolean-field' := true;
@@ -8,6 +9,7 @@ parent {
'string-field' := "FOOBAR";
'array-1D-float' := [4.2, 3.1, 1.0];
'array-2D-int' := [
+
[ 1, 2, 3, 4, 5],
[ 3, 2, 1],
[42]
diff --git a/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/definitions.dl b/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/definitions.dl
new file mode 100644
index 00000000..fde56c23
--- /dev/null
+++ b/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/definitions.dl
@@ -0,0 +1,14 @@
+module de.evoal.core.api.utils.regressions.definitions {
+ type 'parent' {
+ child : instance A;
+ }
+
+ type A {
+ 'float-field' : float;
+ 'string-field' : string;
+ 'integer-field' : int;
+ 'boolean-field' : boolean;
+ 'array-1D-float' : array float;
+ 'array-2D-int' : array array int;
+ }
+}
\ No newline at end of file
diff --git a/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/generator.dl b/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/generator.dl
index 84b046e8..61909779 100644
--- a/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/generator.dl
+++ b/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/generator.dl
@@ -1,25 +1,27 @@
-/**
- * Shekel's foxholes.
- *
- * https://www.sfu.ca/~ssurjano/shekel.html
- */
-type 'shekel' {
- /**
- * The recommended value for the vector a is (1/m)*{1,2,2,4,4,6,3,7,5,5}.
+module de.evoal.core.api.utils.regressions.generator {
+ /**
+ * Shekel's foxholes.
+ *
+ * https://www.sfu.ca/~ssurjano/shekel.html
*/
- 'a' : array float;
-
- /**
- * The recommended value for the constant c is {
- * {4.0, 1.0, 8.0, 6.0, 3.0, 2.0, 5.0, 8.0, 6.0, 7.0},
- * {4.0, 1.0, 8.0, 6.0, 7.0, 9.0, 3.0, 1.0, 2.0, 3.6},
- * {4.0, 1.0, 8.0, 6.0, 3.0, 2.0, 5.0, 8.0, 6.0, 7.0},
- * {4.0, 1.0, 8.0, 6.0, 7.0, 9.0, 3.0, 1.0, 2.0, 3.6}}.
- */
- 'c' : array array float;
-
- /**
- * The recommended value for the constant m is 10.
- */
- 'm' : float;
-}
+ type 'shekel' {
+ /**
+ * The recommended value for the vector a is (1/m)*{1,2,2,4,4,6,3,7,5,5}.
+ */
+ 'a' : array float;
+
+ /**
+ * The recommended value for the constant c is {
+ * {4.0, 1.0, 8.0, 6.0, 3.0, 2.0, 5.0, 8.0, 6.0, 7.0},
+ * {4.0, 1.0, 8.0, 6.0, 7.0, 9.0, 3.0, 1.0, 2.0, 3.6},
+ * {4.0, 1.0, 8.0, 6.0, 3.0, 2.0, 5.0, 8.0, 6.0, 7.0},
+ * {4.0, 1.0, 8.0, 6.0, 7.0, 9.0, 3.0, 1.0, 2.0, 3.6}}.
+ */
+ 'c' : array array float;
+
+ /**
+ * The recommended value for the constant m is 10.
+ */
+ 'm' : float;
+ }
+}
\ No newline at end of file
diff --git a/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/shekel.generator b/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/shekel.generator
index 7486510a..356d4b88 100644
--- a/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/shekel.generator
+++ b/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/shekel.generator
@@ -1,9 +1,9 @@
-use "generator.dl";
-use "test.ddl";
+import "definitions" from de.evoal.core.api.utils.regressions.generator;
+import "data" from de.evoal.core.api.utils.regressions.test;
pipeline example [
- step {
- component 'shekel' {
+ step {
+ component shekel {
'a' := [1.0,2.0,2.0,4.0,4.0,6.0,3.0,7.0,5.0,5.0];
'c' := [
[4.0,1.0,8.0,6.0,3.0,2.0,5.0,8.0,6.0,7.0],
diff --git a/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/test.ddl b/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/test.ddl
index 0a100d63..f07853ee 100644
--- a/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/test.ddl
+++ b/src/core/de.evoal.core.main/src/test/resources/de/evoal/core/api/utils/regressions/test.ddl
@@ -1,3 +1,5 @@
-data:
- quotient real data 'x:0';
- quotient real data 'x:1';
\ No newline at end of file
+module de.evoal.core.api.utils.regressions.test {
+ data:
+ quotient real data 'x:0';
+ quotient real data 'x:1';
+}
\ No newline at end of file
diff --git a/src/core/de.evoal.core.plugin/pom.xml b/src/core/de.evoal.core.plugin/pom.xml
index 1f0849e3..b5ac8f39 100644
--- a/src/core/de.evoal.core.plugin/pom.xml
+++ b/src/core/de.evoal.core.plugin/pom.xml
@@ -120,7 +120,7 @@
<dependency>
<groupId>de.evoal.languages</groupId>
- <artifactId>de.evoal.languages.model.el</artifactId>
+ <artifactId>de.evoal.languages.model.base</artifactId>
<version>${evoal.languages.version}</version>
<scope>provided</scope>
</dependency>
@@ -155,7 +155,7 @@
<dependency>
<groupId>de.evoal.languages</groupId>
- <artifactId>de.evoal.languages.model.el.dsl</artifactId>
+ <artifactId>de.evoal.languages.model.base.dsl</artifactId>
<version>${evoal.languages.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/benchmarks/Rastrigin.java b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/benchmarks/Rastrigin.java
index 3af9be04..11553b11 100644
--- a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/benchmarks/Rastrigin.java
+++ b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/benchmarks/Rastrigin.java
@@ -5,9 +5,9 @@ import de.evoal.core.api.properties.PropertySpecification;
import de.evoal.core.api.utils.InitializationException;
import de.evoal.generator.api.AbstractGeneratorFunction;
import de.evoal.generator.api.GeneratorFunction;
-import de.evoal.languages.model.el.DoubleLiteral;
+import de.evoal.languages.model.base.DoubleLiteral;
import de.evoal.languages.model.generator.Step;
-import de.evoal.languages.model.instance.LiteralValue;
+import de.evoal.languages.model.base.Literal;
import javax.enterprise.context.Dependent;
import javax.inject.Named;
@@ -39,7 +39,7 @@ public class Rastrigin extends AbstractGeneratorFunction {
public GeneratorFunction init(final Step configuration) throws InitializationException {
super.init(configuration);
- a = ((DoubleLiteral)((LiteralValue)configuration.getInstance().findAttribute("a").getValue()).getLiteral()).getValue();
+ a = ((DoubleLiteral)configuration.getInstance().findAttribute("a").getValue()).getLiteral();
return this;
}
diff --git a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/cdi/BenchmarkOptimisationFunction.java b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/cdi/BenchmarkOptimisationFunction.java
index e6cb222b..261ad20d 100644
--- a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/cdi/BenchmarkOptimisationFunction.java
+++ b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/cdi/BenchmarkOptimisationFunction.java
@@ -5,12 +5,12 @@ import de.evoal.core.api.properties.Properties;
import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.core.api.properties.PropertySpecification;
import de.evoal.generator.api.GeneratorFunction;
-import de.evoal.languages.model.dl.AttributeDefinition;
+import de.evoal.languages.model.base.AttributeDefinition;
import de.evoal.languages.model.generator.GeneratorFactory;
import de.evoal.languages.model.generator.Step;
-import de.evoal.languages.model.instance.Attribute;
+import de.evoal.languages.model.base.Attribute;
import de.evoal.languages.model.instance.DataReference;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import de.evoal.languages.model.instance.InstanceFactory;
import lombok.SneakyThrows;
import org.eclipse.emf.ecore.util.EcoreUtil;
diff --git a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/cdi/GeneratorConfigurationProducer.java b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/cdi/GeneratorConfigurationProducer.java
index 572e19f3..44c8da3f 100644
--- a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/cdi/GeneratorConfigurationProducer.java
+++ b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/cdi/GeneratorConfigurationProducer.java
@@ -10,8 +10,8 @@ import de.evoal.languages.model.ddl.dsl.DataDescriptionLanguageStandaloneSetup;
import de.evoal.languages.model.ddl.impl.DdlPackageImpl;
import de.evoal.languages.model.dl.dsl.DefinitionLanguageStandaloneSetup;
import de.evoal.languages.model.dl.impl.DlPackageImpl;
-import de.evoal.languages.model.el.dsl.ExpressionLanguageStandaloneSetup;
-import de.evoal.languages.model.el.impl.ELPackageImpl;
+import de.evoal.languages.model.base.dsl.BaseLanguageStandaloneSetup;
+import de.evoal.languages.model.base.impl.BasePackageImpl;
import de.evoal.languages.model.generator.dsl.GeneratorDSLStandaloneSetup;
import de.evoal.languages.model.generator.Configuration;
import de.evoal.languages.model.generator.impl.GeneratorPackageImpl;
@@ -64,12 +64,12 @@ public class GeneratorConfigurationProducer {
*/
private void initializeEMF() {
DdlPackageImpl.init();
- ELPackageImpl.init();
+ BasePackageImpl.init();
DlPackageImpl.init();
GeneratorPackageImpl.init();
DataDescriptionLanguageStandaloneSetup.doSetup();
- ExpressionLanguageStandaloneSetup.doSetup();
+ BaseLanguageStandaloneSetup.doSetup();
DefinitionLanguageStandaloneSetup.doSetup();
GeneratorDSLStandaloneSetup.doSetup();
}
diff --git a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/functions/ConstantFunction.java b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/functions/ConstantFunction.java
index a91f008c..12e19e52 100644
--- a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/functions/ConstantFunction.java
+++ b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/functions/ConstantFunction.java
@@ -4,10 +4,9 @@ import de.evoal.core.api.properties.Properties;
import de.evoal.core.api.utils.InitializationException;
import de.evoal.generator.api.AbstractGeneratorFunction;
import de.evoal.generator.api.GeneratorFunction;
-import de.evoal.languages.model.el.DoubleLiteral;
+import de.evoal.languages.model.base.DoubleLiteral;
import de.evoal.languages.model.generator.Step;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.LiteralValue;
+import de.evoal.languages.model.base.Array;
import javax.enterprise.context.Dependent;
import javax.inject.Named;
@@ -35,8 +34,6 @@ public class ConstantFunction extends AbstractGeneratorFunction {
constants = constantsArray.getValues()
.stream()
- .map(LiteralValue.class::cast)
- .map(LiteralValue::getLiteral)
.map(DoubleLiteral.class::cast)
.mapToDouble(DoubleLiteral::getValue)
.toArray();
diff --git a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/MultivariateNormalDistribution.java b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/MultivariateNormalDistribution.java
index 44c3f4b9..e3bfd78d 100644
--- a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/MultivariateNormalDistribution.java
+++ b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/MultivariateNormalDistribution.java
@@ -2,10 +2,9 @@ package de.evoal.generator.main.generators;
import de.evoal.core.api.utils.InitializationException;
import de.evoal.generator.api.GeneratorFunction;
-import de.evoal.languages.model.el.DoubleLiteral;
+import de.evoal.languages.model.base.DoubleLiteral;
import de.evoal.languages.model.generator.Step;
-import de.evoal.languages.model.instance.*;
-import de.evoal.languages.model.instance.impl.InstanceImpl;
+import de.evoal.languages.model.base.*;
import lombok.NonNull;
import javax.enterprise.context.Dependent;
@@ -46,7 +45,7 @@ public class MultivariateNormalDistribution extends MultivariateRealDistribution
}
private double readDouble(final Value value) {
- return ((DoubleLiteral)((LiteralValue)value).getLiteral()).getValue();
+ return ((DoubleLiteral)value).getLiteral();
}
private double[] readMeans(final @NonNull Instance instance) {
diff --git a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/MultivariateUniformDistribution.java b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/MultivariateUniformDistribution.java
index be7b5e8e..8b3e0dc9 100644
--- a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/MultivariateUniformDistribution.java
+++ b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/MultivariateUniformDistribution.java
@@ -2,11 +2,11 @@ package de.evoal.generator.main.generators;
import de.evoal.core.api.utils.InitializationException;
import de.evoal.generator.api.GeneratorFunction;
-import de.evoal.languages.model.el.DoubleLiteral;
+import de.evoal.languages.model.base.DoubleLiteral;
import de.evoal.languages.model.generator.Step;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Instance;
-import de.evoal.languages.model.instance.LiteralValue;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Instance;
+import de.evoal.languages.model.base.Literal;
import javax.inject.Named;
import java.util.List;
@@ -45,7 +45,7 @@ public class MultivariateUniformDistribution extends MultivariateRealDistributio
}
private double readDouble(final Instance value, final String name) {
- return ((DoubleLiteral)((LiteralValue)value.findAttribute(name)).getLiteral()).getValue();
+ return ((DoubleLiteral)value.findAttribute(name)).getLiteral();
}
}
diff --git a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/NormalDistribution.java b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/NormalDistribution.java
index df667bad..2438d544 100644
--- a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/NormalDistribution.java
+++ b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/NormalDistribution.java
@@ -2,9 +2,9 @@ package de.evoal.generator.main.generators;
import de.evoal.core.api.utils.InitializationException;
import de.evoal.generator.api.GeneratorFunction;
-import de.evoal.languages.model.el.DoubleLiteral;
+import de.evoal.languages.model.base.DoubleLiteral;
import de.evoal.languages.model.generator.Step;
-import de.evoal.languages.model.instance.LiteralValue;
+import de.evoal.languages.model.base.Literal;
import javax.enterprise.context.Dependent;
import javax.inject.Named;
@@ -17,8 +17,8 @@ public class NormalDistribution extends RealDistributionBase {
public GeneratorFunction init(final Step configuration) throws InitializationException {
super.init(configuration);
- double μ = ((DoubleLiteral)((LiteralValue)configuration.getInstance().findAttribute("μ").getValue()).getLiteral()).getValue();
- double σ = ((DoubleLiteral)((LiteralValue)configuration.getInstance().findAttribute("σ").getValue()).getLiteral()).getValue();
+ double μ = ((DoubleLiteral)configuration.getInstance().findAttribute("μ").getValue()).getValue();
+ double σ = ((DoubleLiteral)configuration.getInstance().findAttribute("σ").getValue()).getValue();
for(int i = 0; i < writeSpecification.getProperties().size(); ++i) {
getDistributions().add(new org.apache.commons.math3.distribution.NormalDistribution(μ, σ));
diff --git a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/UniformDistribution.java b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/UniformDistribution.java
index 9df3bfaa..7b271f5e 100644
--- a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/UniformDistribution.java
+++ b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/generators/UniformDistribution.java
@@ -2,9 +2,8 @@ package de.evoal.generator.main.generators;
import de.evoal.core.api.utils.InitializationException;
import de.evoal.generator.api.GeneratorFunction;
-import de.evoal.languages.model.el.DoubleLiteral;
+import de.evoal.languages.model.base.DoubleLiteral;
import de.evoal.languages.model.generator.Step;
-import de.evoal.languages.model.instance.LiteralValue;
import org.apache.commons.math3.distribution.UniformRealDistribution;
import javax.enterprise.context.Dependent;
@@ -17,7 +16,7 @@ public class UniformDistribution extends RealDistributionBase {
public GeneratorFunction init(final Step configuration) throws InitializationException {
super.init(configuration);
- Object ranges = ((DoubleLiteral)((LiteralValue)configuration.getInstance().findAttribute("μ").getValue()).getLiteral()).getValue();
+ Object ranges = ((DoubleLiteral)configuration.getInstance().findAttribute("μ").getValue()).getLiteral();
if(true) throw new IllegalStateException("Not yet implemented.");
for(int i = 0; i < writeSpecification.getProperties().size(); ++i) {
diff --git a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/utils/ConfigurationHelper.java b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/utils/ConfigurationHelper.java
index 30aa736f..8eb18e72 100644
--- a/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/utils/ConfigurationHelper.java
+++ b/src/core/de.evoal.generator.main/src/main/java/de/evoal/generator/main/utils/ConfigurationHelper.java
@@ -1,8 +1,8 @@
package de.evoal.generator.main.utils;
import de.evoal.core.api.utils.LanguageHelper;
-import de.evoal.languages.model.instance.Array;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Array;
+import de.evoal.languages.model.base.Instance;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/src/core/de.evoal.generator.main/src/main/java/module-info.java b/src/core/de.evoal.generator.main/src/main/java/module-info.java
index 52d4efeb..a424f636 100644
--- a/src/core/de.evoal.generator.main/src/main/java/module-info.java
+++ b/src/core/de.evoal.generator.main/src/main/java/module-info.java
@@ -14,17 +14,18 @@ module de.evoal.generator.main {
requires de.evoal.languages.model.ddl;
requires de.evoal.languages.model.dl;
- requires de.evoal.languages.model.el;
+ requires de.evoal.languages.model.base;
requires de.evoal.languages.model.generator;
requires de.evoal.languages.model.instance;
requires de.evoal.languages.model.ddl.dsl;
requires de.evoal.languages.model.dl.dsl;
- requires de.evoal.languages.model.el.dsl;
+ requires de.evoal.languages.model.base.dsl;
requires de.evoal.languages.model.generator.dsl;
requires de.evoal.core.main;
requires commons.math3;
+ requires com.google.guice;
opens de.evoal.generator.main;
opens de.evoal.generator.main.benchmarks;
diff --git a/src/core/de.evoal.releng.parent/pom.xml b/src/core/de.evoal.releng.parent/pom.xml
index 623d5c0d..51f1672b 100644
--- a/src/core/de.evoal.releng.parent/pom.xml
+++ b/src/core/de.evoal.releng.parent/pom.xml
@@ -175,14 +175,7 @@
<dependency>
<groupId>de.evoal.languages</groupId>
- <artifactId>de.evoal.languages.model.eal</artifactId>
- <version>${evoal.languages.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>de.evoal.languages</groupId>
- <artifactId>de.evoal.languages.model.el</artifactId>
+ <artifactId>de.evoal.languages.model.base</artifactId>
<version>${evoal.languages.version}</version>
<scope>provided</scope>
</dependency>
@@ -218,14 +211,14 @@
<dependency>
<groupId>de.evoal.languages</groupId>
- <artifactId>de.evoal.languages.model.eal.dsl</artifactId>
+ <artifactId>de.evoal.languages.model.ol.dsl</artifactId>
<version>${evoal.languages.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.evoal.languages</groupId>
- <artifactId>de.evoal.languages.model.el.dsl</artifactId>
+ <artifactId>de.evoal.languages.model.base.dsl</artifactId>
<version>${evoal.languages.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/api/configuration/Parameter.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/api/configuration/Parameter.java
index 1acef1fa..69beb329 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/api/configuration/Parameter.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/api/configuration/Parameter.java
@@ -2,10 +2,10 @@ package de.evoal.surrogate.api.configuration;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import de.evoal.languages.model.instance.LiteralValue;
+import de.evoal.languages.model.base.Literal;
import de.evoal.surrogate.main.jackson.ReflectiveDeserializer;
import de.evoal.surrogate.main.jackson.ReflectiveSerializer;
-import de.evoal.languages.model.instance.Attribute;
+import de.evoal.languages.model.base.Attribute;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -25,7 +25,7 @@ public class Parameter {
public static Parameter from(final Attribute attribute) {
final Parameter parameter = new Parameter();
parameter.setName(attribute.getDefinition().getName());
- parameter.setValue(((LiteralValue)attribute.getValue()).getLiteral().getValue());
+ parameter.setValue(((Literal)attribute.getValue()).getValue());
return parameter;
}
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/cdi/MLLConfigurationProducer.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/cdi/MLLConfigurationProducer.java
index 8203dc93..66b46ad3 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/cdi/MLLConfigurationProducer.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/cdi/MLLConfigurationProducer.java
@@ -8,8 +8,8 @@ import de.evoal.languages.model.ddl.dsl.DataDescriptionLanguageStandaloneSetup;
import de.evoal.languages.model.ddl.impl.DdlPackageImpl;
import de.evoal.languages.model.dl.dsl.DefinitionLanguageStandaloneSetup;
import de.evoal.languages.model.dl.impl.DlPackageImpl;
-import de.evoal.languages.model.el.dsl.ExpressionLanguageStandaloneSetup;
-import de.evoal.languages.model.el.impl.ELPackageImpl;
+import de.evoal.languages.model.base.dsl.BaseLanguageStandaloneSetup;
+import de.evoal.languages.model.base.impl.BasePackageImpl;
import de.evoal.languages.model.mll.dsl.MachineLearningLanguageStandaloneSetup;
import de.evoal.languages.model.mll.MachineLearningConfiguration;
import de.evoal.languages.model.mll.impl.MllPackageImpl;
@@ -63,12 +63,12 @@ public class MLLConfigurationProducer {
*/
private void initializeEMF() {
DdlPackageImpl.init();
- ELPackageImpl.init();
+ BasePackageImpl.init();
DlPackageImpl.init();
MllPackageImpl.init();
DataDescriptionLanguageStandaloneSetup.doSetup();
- ExpressionLanguageStandaloneSetup.doSetup();
+ BaseLanguageStandaloneSetup.doSetup();
DefinitionLanguageStandaloneSetup.doSetup();
MachineLearningLanguageStandaloneSetup.doSetup();
}
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/SurrogateFitnessFunction.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/SurrogateFitnessFunction.java
index f820ef82..e1d81c72 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/SurrogateFitnessFunction.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/SurrogateFitnessFunction.java
@@ -2,7 +2,7 @@ package de.evoal.surrogate.main.ea;
import de.evoal.core.api.optimisation.OptimisationFunction;
import de.evoal.core.api.properties.Properties;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import de.evoal.surrogate.api.function.SurrogateFunction;
import javax.enterprise.context.Dependent;
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingInitialCandidates.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingInitialCandidates.java
index 7b4fd452..3c74341a 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingInitialCandidates.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingInitialCandidates.java
@@ -6,7 +6,7 @@ import de.evoal.core.api.properties.Properties;
import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.core.api.properties.stream.FileBasedPropertiesStreamSupplier;
import de.evoal.core.api.properties.stream.PropertiesStreamSupplier;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import de.evoal.surrogate.api.SurrogateBlackboardEntries;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingProducer.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingProducer.java
index 6182827b..625ca16d 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingProducer.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingProducer.java
@@ -5,7 +5,7 @@ import de.evoal.core.api.cdi.BeanFactory;
import de.evoal.core.api.cdi.ConfigurationValue;
import de.evoal.core.api.optimisation.InitialCandidatesProvider;
import de.evoal.core.api.constraints.strategies.RepairStrategy;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Dependent;
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingRepairStrategy.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingRepairStrategy.java
index 138f7d58..47532b19 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingRepairStrategy.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingRepairStrategy.java
@@ -6,7 +6,7 @@ import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.core.api.properties.stream.FileBasedPropertiesStreamSupplier;
import de.evoal.core.api.properties.stream.PropertiesStreamSupplier;
import de.evoal.core.api.constraints.strategies.RepairStrategy;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import de.evoal.surrogate.api.SurrogateBlackboardEntries;
import io.jenetics.util.RandomRegistry;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/internal/StatementExecutor.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/internal/StatementExecutor.java
index 212e8db4..1e0d90c5 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/internal/StatementExecutor.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/internal/StatementExecutor.java
@@ -4,8 +4,8 @@ import de.evoal.core.api.cdi.BeanFactory;
import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.core.api.utils.ConstantSwitch;
import de.evoal.languages.model.ddl.DataDescription;
-import de.evoal.languages.model.el.Call;
-import de.evoal.languages.model.el.StringLiteral;
+import de.evoal.languages.model.base.Call;
+import de.evoal.languages.model.base.StringLiteral;
import de.evoal.languages.model.mll.*;
import de.evoal.languages.model.mll.util.MllSwitch;
import de.evoal.surrogate.api.SurrogateInformationCalculator;
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/constraint/ConstraintStatistics.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/constraint/ConstraintStatistics.java
index 683eebb0..6b23a326 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/constraint/ConstraintStatistics.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/constraint/ConstraintStatistics.java
@@ -12,7 +12,7 @@ import de.evoal.core.api.constraints.calculation.CalculationStrategy;
import de.evoal.core.api.constraints.model.ConstraintResult;
import de.evoal.core.api.constraints.model.Constraints;
import de.evoal.core.api.constraints.strategies.CalculationResult;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import javax.annotation.PostConstruct;
import javax.enterprise.context.Dependent;
import lombok.SneakyThrows;
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/correlated/GenerationStatisticsWriter.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/correlated/GenerationStatisticsWriter.java
index 4fca4017..299130b5 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/correlated/GenerationStatisticsWriter.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/correlated/GenerationStatisticsWriter.java
@@ -11,7 +11,7 @@ import de.evoal.core.api.statistics.writer.Column;
import de.evoal.core.api.statistics.writer.ColumnType;
import de.evoal.core.api.statistics.writer.StatisticsWriter;
import de.evoal.core.api.utils.LanguageHelper;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import de.evoal.core.api.properties.Properties;
import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.surrogate.api.training.TrainingDataManager;
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/ranged/GenerationStatisticsWriter.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/ranged/GenerationStatisticsWriter.java
index 2ca48b4f..8ca3414c 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/ranged/GenerationStatisticsWriter.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/statistics/ranged/GenerationStatisticsWriter.java
@@ -13,7 +13,7 @@ import de.evoal.core.api.statistics.writer.StatisticsWriter;
import de.evoal.core.api.correlations.Correlation;
import de.evoal.core.api.correlations.Correlations;
import de.evoal.core.api.correlations.RangedCorrelation;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import java.util.*;
import javax.annotation.PostConstruct;
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/module-info.java b/src/core/de.evoal.surrogate.api/src/main/java/module-info.java
index e93c2f8a..ab14d568 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/module-info.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/module-info.java
@@ -20,14 +20,15 @@ module de.evoal.surrogate.api {
requires de.evoal.core.main;
requires de.evoal.languages.model.ddl;
requires de.evoal.languages.model.dl;
- requires de.evoal.languages.model.el;
+ requires de.evoal.languages.model.base;
requires de.evoal.languages.model.mll;
requires de.evoal.languages.model.ddl.dsl;
requires de.evoal.languages.model.dl.dsl;
- requires de.evoal.languages.model.el.dsl;
+ requires de.evoal.languages.model.base.dsl;
requires de.evoal.languages.model.mll.dsl;
requires de.evoal.languages.model.instance;
requires de.evoal.core.ea;
+ requires com.google.guice;
exports de.evoal.surrogate.api;
exports de.evoal.surrogate.api.function;
diff --git a/src/core/de.evoal.surrogate.ws/src/main/java/de/evoal/surrogate/ws/WebServiceFitness.java b/src/core/de.evoal.surrogate.ws/src/main/java/de/evoal/surrogate/ws/WebServiceFitness.java
index e2810086..f707d1b7 100644
--- a/src/core/de.evoal.surrogate.ws/src/main/java/de/evoal/surrogate/ws/WebServiceFitness.java
+++ b/src/core/de.evoal.surrogate.ws/src/main/java/de/evoal/surrogate/ws/WebServiceFitness.java
@@ -1,9 +1,8 @@
package de.evoal.surrogate.ws;
-import de.evoal.core.api.ea.fitness.FitnessFunction;
+import de.evoal.core.api.optimisation.OptimisationFunction;
import de.evoal.core.api.properties.Properties;
-import de.evoal.core.api.utils.LanguageHelper;
-import de.evoal.languages.model.instance.Instance;
+import de.evoal.languages.model.base.Instance;
import javax.enterprise.context.Dependent;
import javax.inject.Named;
@@ -13,7 +12,7 @@ import javax.inject.Named;
*/
@Dependent
@Named("webservice")
-public class WebServiceFitness implements FitnessFunction {
+public class WebServiceFitness implements OptimisationFunction {
@Override
public double[] evaluate(final Properties properties) {
@@ -21,7 +20,7 @@ public class WebServiceFitness implements FitnessFunction {
}
@Override
- public FitnessFunction init(final Instance config) {
+ public OptimisationFunction init(final Instance config) {
// LanguageHelper.lookup();
return this;
diff --git a/src/core/de.evoal.surrogate.ws/src/main/java/module-info.java b/src/core/de.evoal.surrogate.ws/src/main/java/module-info.java
index 292e5cd5..e57a2b1e 100644
--- a/src/core/de.evoal.surrogate.ws/src/main/java/module-info.java
+++ b/src/core/de.evoal.surrogate.ws/src/main/java/module-info.java
@@ -9,6 +9,7 @@ module de.evoal.surrogate.ws {
requires de.evoal.core.main;
requires de.evoal.surrogate.api;
+ requires de.evoal.languages.model.base;
opens de.evoal.surrogate.ws to weld.core.impl;
}
--
GitLab