Skip to content
GitLab
Commit 2c25489e authored by Alicja Reniewicz's avatar Alicja Reniewicz
Browse files

Merge branch 'rc3.1-update-solvers' into 'rc3.1' 

Rc3.1 update solvers

See merge request !6
parents c9d2ef5d a918fa9e
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 2c25489e
......@@ -20,4 +20,9 @@ build/
nbbuild/
dist/
nbdist/
.nb-gradle/
\ No newline at end of file
.nb-gradle/
### MCTS tree printing ###
zpp-solver/testing_module/src/main/resources/nodes*
zpp-solver/testing_module/src/main/resources/tree*
\ No newline at end of file
cp-solver/src/main/java/eu/melodic/upperware/cpsolver/solver/parser/CommonConstraintProblemParser.java
View file @ 2c25489e
......@@ -336,4 +336,4 @@ public class CommonConstraintProblemParser implements ConstraintProblemParser {
return expression instanceof ComposedExpression;
}
}
}
\ No newline at end of file
cp-solver/src/main/java/eu/melodic/upperware/cpsolver/solver/parser/SolverParsedData.java
View file @ 2c25489e
......@@ -11,6 +11,7 @@ import org.chocosolver.solver.variables.Variable;
import org.chocosolver.solver.variables.impl.FixedIntVarImpl;
import org.chocosolver.solver.variables.impl.FixedRealVarImpl;
import java.time.Clock;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -35,6 +36,21 @@ public class SolverParsedData {
return result;
}
public List<CpSolution> solve(int timeLimit) {
Solver solver = model.getSolver();
solver.limitTime(timeLimit + "s");
List<CpSolution> result = new ArrayList<>();
Clock clock = Clock.systemDefaultZone();
long startTime = clock.millis();
long currentTime = startTime;
while (currentTime - startTime <= 1000*timeLimit && solver.solve()) {
result.add(createCpSolution());
solver.limitTime(timeLimit + "s");
currentTime = clock.millis();
}
return result;
}
private CpSolution createCpSolution() {
Map<String, IntVar> intResult = intVars.values()
......
utility-generator/src/main/java/eu/melodic/upperware/utilitygenerator/UtilityGeneratorApplication.java
View file @ 2c25489e
......@@ -19,8 +19,8 @@ import eu.paasage.upperware.security.authapi.token.JWTService;
import lombok.extern.slf4j.Slf4j;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
@Slf4j
public class UtilityGeneratorApplication {
......@@ -28,36 +28,33 @@ public class UtilityGeneratorApplication {
private UtilityFunctionEvaluator utilityFunctionEvaluator;
public UtilityGeneratorApplication(String camelModelFilePath, String cpModelFilePath, boolean readFromFile, NodeCandidates nodeCandidates, UtilityGeneratorProperties properties,
MelodicSecurityProperties melodicSecurityProperties, JWTService jwtService, PenaltyFunctionProperties penaltyFunctionProperties) {
MelodicSecurityProperties melodicSecurityProperties, JWTService jwtService, PenaltyFunctionProperties penaltyFunctionProperties) {
log.info("Creating of the Utility Generator");
utilityFunctionEvaluator = new UtilityFunctionEvaluator(camelModelFilePath, cpModelFilePath, readFromFile, nodeCandidates, properties, melodicSecurityProperties, penaltyFunctionProperties, jwtService);
}
@SafeVarargs
public UtilityGeneratorApplication(String camelModelFilePath, String cpModelFilePath, boolean readFromFile, NodeCandidates nodeCandidates, UtilityGeneratorProperties properties,
MelodicSecurityProperties melodicSecurityProperties, JWTService jwtService, PenaltyFunctionProperties penaltyFunctionProperties,
Map.Entry<TemplateProvider.AvailableTemplates, Double>... utilityComponents) {
MelodicSecurityProperties melodicSecurityProperties, JWTService jwtService, PenaltyFunctionProperties penaltyFunctionProperties,
List<Map.Entry<TemplateProvider.AvailableTemplates, Double>> utilityComponents) {
log.info("Creating template Utility Generator");
checkWeightsOfUtilityComponents(utilityComponents);
utilityFunctionEvaluator = new UtilityFunctionEvaluator(camelModelFilePath, cpModelFilePath, readFromFile, nodeCandidates, properties,
utilityFunctionEvaluator = new UtilityFunctionEvaluator(camelModelFilePath, cpModelFilePath, readFromFile, nodeCandidates, properties,
melodicSecurityProperties, penaltyFunctionProperties, jwtService, utilityComponents);
}
@SafeVarargs
public UtilityGeneratorApplication(String cpModelFilePath, NodeCandidates nodeCandidates, Map.Entry<TemplateProvider.AvailableTemplates, Double>... utilityComponents) {
public UtilityGeneratorApplication(String cpModelFilePath, NodeCandidates nodeCandidates, List<Map.Entry<TemplateProvider.AvailableTemplates, Double>> utilityComponents) {
log.info("Creating template Utility Generator");
checkWeightsOfUtilityComponents(utilityComponents);
utilityFunctionEvaluator = new UtilityFunctionEvaluator( cpModelFilePath, nodeCandidates, utilityComponents);
utilityFunctionEvaluator = new UtilityFunctionEvaluator(cpModelFilePath, nodeCandidates, utilityComponents);
}
public double evaluate(Collection<VariableValueDTO> solution) {
return this.utilityFunctionEvaluator.evaluate(solution);
}
@SafeVarargs
private final void checkWeightsOfUtilityComponents(Map.Entry<TemplateProvider.AvailableTemplates, Double>... utilityComponents) {
if (Stream.of(utilityComponents).map(Map.Entry::getValue).reduce(0.0, Double::sum) > 1.0
|| Stream.of(utilityComponents).map(Map.Entry::getValue).anyMatch(weight -> weight < 0)) {
private void checkWeightsOfUtilityComponents(List<Map.Entry<TemplateProvider.AvailableTemplates, Double>> utilityComponents) {
if (utilityComponents.stream().map(Map.Entry::getValue).reduce(0.0, Double::sum) > 1.0
|| utilityComponents.stream().map(Map.Entry::getValue).anyMatch(weight -> weight < 0)) {
throw new RuntimeException("Sum of weights must be smaller or equal to 1 and non-negative!");
}
}
......
utility-generator/src/main/java/eu/melodic/upperware/utilitygenerator/evaluator/EvaluatingUtils.java
View file @ 2c25489e
......@@ -25,9 +25,7 @@ import static java.util.Objects.isNull;
@Slf4j
public class EvaluatingUtils {
static Collection<ConfigurationElement> convertSolutionToNodeCandidates(Collection<VariableDTO> variables, NodeCandidates nodeCandidates, Collection<VariableValueDTO> solution) {
public static Collection<ConfigurationElement> convertSolutionToNodeCandidates(Collection<VariableDTO> variables, NodeCandidates nodeCandidates, Collection<VariableValueDTO> solution) {
log.debug("Converting solution to Node Candidates");
Collection<ConfigurationElement> newConfiguration = new ArrayList<>();
......
utility-generator/src/main/java/eu/melodic/upperware/utilitygenerator/evaluator/UtilityFunctionEvaluator.java
View file @ 2c25489e
......@@ -72,10 +72,9 @@ public class UtilityFunctionEvaluator {
constraintProblemExtractor.endWorkWithCPModel();
}
@SafeVarargs
public UtilityFunctionEvaluator(String camelModelFilePath, String cpModelFilePath, boolean readFromFile, NodeCandidates nodeCandidates, UtilityGeneratorProperties properties,
MelodicSecurityProperties melodicSecurityProperties, PenaltyFunctionProperties penaltyFunctionProperties, JWTService jwtService,
Map.Entry<TemplateProvider.AvailableTemplates, Double>... utilityComponents) {
List<Map.Entry<TemplateProvider.AvailableTemplates, Double>> utilityComponents) {
Objects.requireNonNull(properties.getUtilityGenerator().getDlmsControllerUrl(), "Utility Generator properties with DLMS Controller URL does not exist");
this.nodeCandidates = Objects.requireNonNull(nodeCandidates, "List of Node Candidates is null");
......@@ -99,8 +98,7 @@ public class UtilityFunctionEvaluator {
constraintProblemExtractor.endWorkWithCPModel();
}
@SafeVarargs
public UtilityFunctionEvaluator(String cpModelFilePath, NodeCandidates nodeCandidates, Map.Entry<TemplateProvider.AvailableTemplates, Double>... utilityComponents) {
public UtilityFunctionEvaluator(String cpModelFilePath, NodeCandidates nodeCandidates, List<Map.Entry<TemplateProvider.AvailableTemplates, Double>> utilityComponents) {
this.nodeCandidates = Objects.requireNonNull(nodeCandidates, "List of Node Candidates is null");
ConstraintProblemExtractor constraintProblemExtractor = new ConstraintProblemExtractor(cpModelFilePath, true);
......@@ -140,7 +138,7 @@ public class UtilityFunctionEvaluator {
Collection<ConfigurationElement> newConfiguration = convertSolutionToNodeCandidates(this.variablesFromConstraintProblem, this.nodeCandidates, solution);
if (newConfiguration.isEmpty()) {
log.info("No Node Candidate for the evaluated solution, returning 0");
log.debug("No Node Candidate for the evaluated solution, returning 0");
return 0;
} else if (!this.deployedConfiguration.isEmpty() && EvaluatingUtils.areUnmoveableComponentsMoved(this.unmoveableComponents, this.deployedConfiguration, newConfiguration)) {
log.info("Proposed solution moves the unmoveable component, returning 0");
......
utility-generator/src/main/java/eu/melodic/upperware/utilitygenerator/utility_function/utility_templates_provider/TemplateProvider.java
View file @ 2c25489e
......@@ -5,9 +5,9 @@ import eu.paasage.upperware.metamodel.cp.VariableType;
import lombok.extern.slf4j.Slf4j;
import java.util.Collection;
import java.util.Map;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static eu.melodic.upperware.utilitygenerator.utility_function.utility_templates_provider.BasicTemplatesProvider.*;
......@@ -23,18 +23,19 @@ public class TemplateProvider {
CORES_MIN_MAX,
DISK_MIN_MAX,
RAM_MIN_MAX
};
}
;
@SafeVarargs
public static String getTemplate(Collection<VariableDTO> variablesFromConstraintProblem,
Map.Entry<AvailableTemplates, Double>... utilityComponents) {
return getSum( Stream.of(utilityComponents).map( (template) ->
multiply( template.getValue().toString(), getTemplate(variablesFromConstraintProblem, template.getKey()))
).collect(Collectors.toList()));
List<Map.Entry<AvailableTemplates, Double>> utilityComponents) {
return getSum(utilityComponents.stream().map((template) ->
multiply(template.getValue().toString(), getTemplate(variablesFromConstraintProblem, template.getKey()))
).collect(Collectors.toList()));
}
private static String getTemplate(Collection<VariableDTO> variablesFromConstraintProblem, AvailableTemplates type) {
switch (type){
switch (type) {
case COST:
return getOnlyCostUtility(variablesFromConstraintProblem);
case CORES:
......
utility-generator/src/main/test/groovy/eu/melodic/upperware/utilitygenerator/TemplateUtilityFCRTest.groovy
View file @ 2c25489e
......@@ -130,14 +130,14 @@ class TemplateUtilityFCRTest extends Specification{
newConfiguration.add(new IntVariableValueDTO(lbStorageName, 10))
UtilityGeneratorApplication utilityGenerator =
new UtilityGeneratorApplication("src/main/test/resources/FCRForTemplates-CP.xmi",
mockNodeCandidates, new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.COST, 1.0d))
mockNodeCandidates, Arrays.asList(new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.COST, 1.0d)))
UtilityGeneratorApplication utilityGenerator2 =
new UtilityGeneratorApplication("src/main/test/resources/FCRForTemplates-CP.xmi",
mockNodeCandidates,
new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.COST, 0.5d),
Arrays.asList(new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.COST, 0.5d),
new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.CORES, 0.5d*0.333d),
new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.DISK, 0.5d*0.333d),
new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.RAM, 0.5d*0.333d))
new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.RAM, 0.5d*0.333d)))
when:
double result = utilityGenerator.evaluate(newConfiguration)
double result2 = utilityGenerator2.evaluate(newConfiguration)
......@@ -173,14 +173,14 @@ class TemplateUtilityFCRTest extends Specification{
UtilityGeneratorApplication utilityGenerator =
new UtilityGeneratorApplication(path, "src/main/test/resources/FCRForTemplates-CP.xmi", true,
mockNodeCandidates, utilityGeneratorProperties, securityProperties, jwtService, properties,
new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.COST, 1.0d))
Arrays.asList(new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.COST, 1.0d)))
UtilityGeneratorApplication utilityGenerator2 =
new UtilityGeneratorApplication(path, "src/main/test/resources/FCRForTemplates-CP.xmi", true,
mockNodeCandidates, utilityGeneratorProperties, securityProperties, jwtService, properties,
new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.COST, 0.5d),
Arrays.asList(new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.COST, 0.5d),
new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.CORES, 0.5d*0.333d),
new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.DISK, 0.5d*0.333d),
new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.RAM, 0.5d*0.333d))
new AbstractMap.SimpleEntry<TemplateProvider.AvailableTemplates, Double>(TemplateProvider.AvailableTemplates.RAM, 0.5d*0.333d)))
when:
double result = utilityGenerator.evaluate(newConfiguration)
double result2 = utilityGenerator2.evaluate(newConfiguration)
......
zpp-solver/cp-parser/src/main/java/cp_wrapper/CPWrapper.java → zpp-solver/cp-parser/src/main/java/eu/melodic/upperware/cp_wrapper/CPWrapper.java
View file @ 2c25489e
package cp_wrapper;
import cp_wrapper.parser.CPParsedData;
import cp_wrapper.parser.CPParser;
import cp_wrapper.utility_provider.UtilityProvider;
import cp_wrapper.utils.DomainHandler;
import cp_wrapper.utils.numeric_value.*;
import cp_wrapper.utils.numeric_value.implementations.DoubleValue;
import cp_wrapper.utils.variable_orderer.HeuristicVariableOrderer;
import cp_wrapper.utils.VariableNumericType;
import cp_wrapper.utils.variable_orderer.VariableOrderer;
package eu.melodic.upperware.cp_wrapper;
import eu.melodic.upperware.cp_wrapper.parser.CPParsedData;
import eu.melodic.upperware.cp_wrapper.parser.CPParser;
import eu.melodic.upperware.cp_wrapper.utility_provider.UtilityProvider;
import eu.melodic.upperware.cp_wrapper.utils.cp_variable.VariableNumericType;
import eu.melodic.upperware.cp_wrapper.utils.domain_handler.DomainHandler;
import eu.melodic.upperware.cp_wrapper.utils.numeric_value.NumericValueInterface;
import eu.melodic.upperware.cp_wrapper.utils.numeric_value.implementations.DoubleValue;
import eu.melodic.upperware.cp_wrapper.utils.variable_orderer.HeuristicVariableOrderer;
import eu.melodic.upperware.cp_wrapper.utils.variable_orderer.RandomVariableOrderer;
import eu.melodic.upperware.cp_wrapper.utils.variable_orderer.VariableOrderer;
import eu.melodic.upperware.utilitygenerator.cdo.cp_model.DTO.VariableDTO;
import eu.melodic.upperware.utilitygenerator.cdo.cp_model.DTO.VariableValueDTO;
import eu.melodic.upperware.utilitygenerator.cdo.cp_model.DTO.VariableValueDTOFactory;
import eu.paasage.upperware.metamodel.cp.*;
import lombok.Getter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
public class CPWrapper {
private VariableOrderer variableOrderer;
private CPParsedData cpParsedData;
private UtilityProvider utilityProvider;
@Getter
private Collection<VariableDTO> variableDTOCollection;
@Getter
private long numberOfComponents;
public void parse(ConstraintProblem constraintProblem, UtilityProvider utility) {
CPParser cpParser = new CPParser();
cpParsedData = cpParser.parse(constraintProblem);
this.utilityProvider = utility;
this.variableOrderer = new HeuristicVariableOrderer(cpParsedData.getConstraintGraph());
this.variableOrderer = new HeuristicVariableOrderer(cpParsedData.getConstraintGraph(), cpParsedData.getVariables());
this.numberOfComponents = cpParsedData.getVariables().stream().map(CpVariable::getComponentId).distinct().count();
this.variableDTOCollection = cpParsedData.getVariables().stream()
.map(variable -> new VariableDTO(variable.getId(), variable.getComponentId(), variable.getVariableType()))
.collect(Collectors.toList());
}
public void setVariableOrdering(VariableOrderer vO) {
this.variableOrderer = vO;
public void parseWithRandomOrder(ConstraintProblem constraintProblem, UtilityProvider utility) {
CPParser cpParser = new CPParser();
cpParsedData = cpParser.parse(constraintProblem);
this.utilityProvider = utility;
this.numberOfComponents = cpParsedData.getVariables().stream().map(CpVariable::getComponentId).distinct().count();
this.variableOrderer = new RandomVariableOrderer(cpParsedData.getVariables());
this.variableDTOCollection = cpParsedData.getVariables().stream()
.map(variable -> new VariableDTO(variable.getId(), variable.getComponentId(), variable.getVariableType()))
.collect(Collectors.toList());
}
public boolean checkIfFeasible(List<Integer> assignment) {
......@@ -43,26 +59,12 @@ public class CPWrapper {
return cpParsedData.getVariableDomain(variableOrderer.getNameFromIndex(variableIndex));
}
private NumericValueInterface getVariableValueFromDomainIndex(int varIndex, int value) {
String variableName = variableOrderer.getNameFromIndex(varIndex);
Domain domain = cpParsedData.getVariableDomain(variableName);
if (DomainHandler.isRangeDomain(domain)) {
return DomainHandler.getRangeValue(value, (RangeDomain) domain);
} else if (DomainHandler.isNumericListDomain(domain)) {
return DomainHandler.getNumericListValue(value, (NumericListDomain) domain);
}
throw new RuntimeException("Only domains of types RangeDomain, NumericListDomain are supported!");
public int getIndexFromValue(NumericValueInterface value, int variable) {
return DomainHandler.getValueIndex(value, getVariableDomain(variable));
}
private Map<String, NumericValueInterface> getAssignmentFromValueList(List<Integer> assignments) {
Map<String, NumericValueInterface> vars = new HashMap<>();
for (int i = 0; i < assignments.size(); i++) {
if (variableOrderer.exists(i)) {
vars.put(variableOrderer.getNameFromIndex(i), getVariableValueFromDomainIndex(i, assignments.get(i)));
}
}
return vars;
public int getVariableIndexFromComponentAndType(String componentId, VariableType type) {
return this.variableOrderer.getIndexFromComponentType(componentId, type);
}
public int countViolatedConstraints(List<Integer> assignments) {
......@@ -85,19 +87,17 @@ public class CPWrapper {
public List<VariableValueDTO> assignmentToVariableValueDTOList(List<Integer> assignments) {
List<VariableValueDTO> result = new ArrayList<>();
for (int i = 0; i < assignments.size(); i++) {
NumericValueInterface val = getVariableValueFromDomainIndex(i, assignments.get(i));
NumericValueInterface value = getVariableValueFromDomainIndex(i, assignments.get(i));
if (cpParsedData.getVariableType(variableOrderer.getNameFromIndex(i)) == VariableNumericType.INT) {
if (!(val.isInteger())) {
if (!(value.isInteger())) {
throw new RuntimeException("");
}
result.add( VariableValueDTOFactory.createElement(variableOrderer.getNameFromIndex(i), val.getIntValue())
);
result.add(VariableValueDTOFactory.createElement(variableOrderer.getNameFromIndex(i), value.getIntValue()));
} else {
if (!(val instanceof DoubleValue)) {
if (!(value instanceof DoubleValue)) {
throw new RuntimeException("Variable " + variableOrderer.getNameFromIndex(i) +" is not of double type!");
}
result.add( VariableValueDTOFactory.createElement( variableOrderer.getNameFromIndex(i), val.getDoubleValue())
);
result.add( VariableValueDTOFactory.createElement(variableOrderer.getNameFromIndex(i), value.getDoubleValue()));
}
}
return result;
......@@ -123,4 +123,34 @@ public class CPWrapper {
public int getVariablesCount() {
return cpParsedData.getVariableNames().size();
}
public String getNameFromIndex(int index) {
return this.variableOrderer.getNameFromIndex(index);
}
public int getValueFromIndex(int value, int variableIndex) {
return getVariableValueFromDomainIndex(variableIndex, value).getIntValue();
}
private NumericValueInterface getVariableValueFromDomainIndex(int varIndex, int value) {
Domain domain = cpParsedData.getVariableDomain(variableOrderer.getNameFromIndex(varIndex));
if (DomainHandler.isRangeDomain(domain)) {
return DomainHandler.getRangeValue(value, (RangeDomain) domain);
} else if (DomainHandler.isNumericListDomain(domain)) {
return DomainHandler.getNumericListValue(value, (NumericListDomain) domain);
}
throw new RuntimeException("Only domains of types RangeDomain, NumericListDomain are supported!");
}
private Map<String, NumericValueInterface> getAssignmentFromValueList(List<Integer> assignments) {
Map<String, NumericValueInterface> vars = new HashMap<>();
for (int i = 0; i < assignments.size(); i++) {
if (variableOrderer.exists(i)) {
vars.put(variableOrderer.getNameFromIndex(i), getVariableValueFromDomainIndex(i, assignments.get(i)));
}
}
return vars;
}
}
zpp-solver/cp-parser/src/main/java/cp_wrapper/parser/CPParsedData.java → zpp-solver/cp-parser/src/main/java/eu/melodic/upperware/cp_wrapper/parser/CPParsedData.java
View file @ 2c25489e
package cp_wrapper.parser;
package eu.melodic.upperware.cp_wrapper.parser;
/*
This class contains all data representing a specific constraint problem.
*/
import cp_wrapper.utils.constraint.Constraint;
import cp_wrapper.utils.ConstraintGraph;
import cp_wrapper.utils.VariableNumericType;
import cp_wrapper.utils.numeric_value.NumericValueInterface;
//import eu.melodic.upperware.cpsolver.solver.parser.creator.*;
import eu.melodic.upperware.cp_wrapper.utils.constraint.Constraint;
import eu.melodic.upperware.cp_wrapper.utils.constraint_graph.ConstraintGraph;
import eu.melodic.upperware.cp_wrapper.utils.cp_variable.VariableNumericType;
import eu.melodic.upperware.cp_wrapper.utils.numeric_value.NumericValueInterface;
import eu.paasage.upperware.metamodel.cp.*;
import eu.paasage.upperware.metamodel.types.BasicTypeEnum;
import lombok.Getter;
......@@ -18,12 +16,13 @@ import java.util.stream.Collectors;
import static java.lang.String.format;
public class CPParsedData {
private Collection<Constant> constants;
private Collection<CpMetric> metrics;
private Collection<Constraint> constraints;
@Getter
private Collection<CpVariable> variables;
//private IntVarCreator intVarCreator;
static final List<BasicTypeEnum> ACCEPTED_INT_TYPES = Arrays.asList(BasicTypeEnum.INTEGER, BasicTypeEnum.LONG);
@Getter
private ConstraintGraph constraintGraph;
......@@ -33,12 +32,6 @@ public class CPParsedData {
return nameToVariable.keySet();
}
protected void init() {
//intVarCreator = new IntVarCreator();
initializeConstraintGraph();
initializeNameToVariable();
}
public boolean checkIfFeasible(Map<String, NumericValueInterface> variables) {
for (Constraint c : constraints) {
if (!c.evaluate(variables)) {
......@@ -48,15 +41,6 @@ public class CPParsedData {
return true;
}
BasicTypeEnum getDomainType(Domain domain) {
if (domain instanceof RangeDomain) {
return ((RangeDomain) domain).getType();
} else if (domain instanceof NumericListDomain) {
return ((NumericListDomain) domain).getType();
}
throw new RuntimeException(format("Unsupported Domain type %s, only RangeDomain and NumericListDomain are supported",
domain.getClass().getSimpleName()));
}
public int countViolatedConstraints(Map<String, NumericValueInterface> variables) {
return constraints.stream()
.map(c -> c.evaluate(variables) ? 0 : 1)
......@@ -67,34 +51,21 @@ public class CPParsedData {
return constraintGraph.getVariableHeuristicEvaluation(variable, variables);
}
public void updateMetrics(Collection<CpMetric> metrics) {
//TODO
}
public Domain getVariableDomain(String variable) {
return nameToVariable.get(variable).getDomain();
}
public VariableNumericType getVariableType(String name) {
if (nameToVariable.get(name) instanceof CpVariable && ACCEPTED_INT_TYPES.contains(getDomainType((nameToVariable.get(name)).getDomain()))) {
if (ACCEPTED_INT_TYPES.contains(getDomainType((nameToVariable.get(name)).getDomain()))) {
return VariableNumericType.INT;
} else {
return VariableNumericType.DOUBLE;
}
}
private void initializeNameToVariable() {
nameToVariable = new HashMap<String, CpVariable>();
for (CpVariable var : variables) {
nameToVariable.put(var.getId(), var);
}
}
private void initializeConstraintGraph() {
List<String> variableNames =
variables.stream()
.map(CPElement::getId)
.collect(Collectors.toList());
constraintGraph = new ConstraintGraph(constraints, variableNames);
void init() {
initializeConstraintGraph();
initializeNameToVariable();
}
void postConstants(Collection<Constant> constants) {
......@@ -109,4 +80,29 @@ public class CPParsedData {
void postVariables(Collection<CpVariable> variables) {
this.variables = variables;
}
private BasicTypeEnum getDomainType(Domain domain) {
if (domain instanceof RangeDomain) {
return ((RangeDomain) domain).getType();
} else if (domain instanceof NumericListDomain) {
return ((NumericListDomain) domain).getType();
}
throw new RuntimeException(format("Unsupported Domain type %s, only RangeDomain and NumericListDomain are supported",
domain.getClass().getSimpleName()));
}
private void initializeNameToVariable() {
nameToVariable = new HashMap<>();
for (CpVariable var : variables) {
nameToVariable.put(var.getId(), var);
}
}
private void initializeConstraintGraph() {
List<String> variableNames =
variables.stream()
.map(CPElement::getId)
.collect(Collectors.toList());
constraintGraph = new ConstraintGraph(constraints, variableNames);
}
}
zpp-solver/cp-parser/src/main/java/cp_wrapper/parser/CPParser.java → zpp-solver/cp-parser/src/main/java/eu/melodic/upperware/cp_wrapper/parser/CPParser.java
View file @ 2c25489e
package cp_wrapper.parser;
package eu.melodic.upperware.cp_wrapper.parser;
/*
This class is responsible for transforming ConstraintProblem interface into
CPParser class. The only work that is done here is transforming ComparisonExpression interface
into less abstract ArConstraint instance.
*/
import cp_wrapper.utils.constraint.Constraint;
import cp_wrapper.utils.constraint.ConstraintImpl;
import eu.melodic.upperware.cp_wrapper.utils.constraint.Constraint;
import eu.melodic.upperware.cp_wrapper.utils.constraint.ConstraintImpl;
import eu.paasage.upperware.metamodel.cp.ConstraintProblem;
import java.util.List;
......
zpp-solver/cp-parser/src/main/java/eu/melodic/upperware/cp_wrapper/solution/CpSolution.java 0 → 100644
View file @ 2c25489e
package eu.melodic.upperware.cp_wrapper.solution;
import eu.melodic.upperware.utilitygenerator.cdo.cp_model.DTO.VariableValueDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.util.List;
@Data
@AllArgsConstructor
public class CpSolution {