test marche
This commit is contained in:
@@ -5,7 +5,6 @@ import java.util.Set;
|
||||
import fr.istic.nplouzeau.cartaylor.api.PartType;
|
||||
|
||||
|
||||
|
||||
public class CompatibilityChecker implements fr.istic.nplouzeau.cartaylor.api.CompatibilityChecker {
|
||||
|
||||
private HashMap<PartType, Set<PartType>> incompatibilities;
|
||||
@@ -14,7 +13,6 @@ public class CompatibilityChecker implements fr.istic.nplouzeau.cartaylor.api.Co
|
||||
public CompatibilityChecker( HashMap<PartType, Set<PartType>> incompatibilities, HashMap<PartType, Set<PartType>> requirements){
|
||||
this.incompatibilities=incompatibilities;
|
||||
this.requirements= requirements;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -3,7 +3,6 @@ package src;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import fr.istic.nplouzeau.cartaylor.api.PartType;
|
||||
|
||||
public class CompatibilityManager implements fr.istic.nplouzeau.cartaylor.api.CompatibilityManager {
|
||||
@@ -128,4 +127,9 @@ public class CompatibilityManager implements fr.istic.nplouzeau.cartaylor.api.Co
|
||||
public Set<PartType> getRequirements(PartType reference) {
|
||||
return this.requirements.get(reference);
|
||||
}
|
||||
|
||||
public void addRequirements(src.PartType eH120, HashSet<src.PartType> eH120Requirement) {
|
||||
// TODO Auto-generated method stub
|
||||
throw new UnsupportedOperationException("Unimplemented method 'addRequirements'");
|
||||
}
|
||||
}
|
||||
@@ -18,11 +18,11 @@ public class Configuration implements fr.istic.nplouzeau.cartaylor.api.Configura
|
||||
for(PartType pt: selectedParts){
|
||||
//Verifier Requirements
|
||||
for(PartType require : compatibilityManager.getRequirements(pt)){
|
||||
if(!selectedParts.contains(pt)) return false;
|
||||
if(!selectedParts.contains(require)) return false;
|
||||
}
|
||||
//Verifier Incompabilities
|
||||
for(PartType incompa : compatibilityManager.getIncompatibilities(pt)){
|
||||
if(selectedParts.contains(pt)) return false;
|
||||
if(selectedParts.contains(incompa)) return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -71,7 +71,7 @@ public class test {
|
||||
Set<PartType> ISRequirement = new HashSet<PartType>();
|
||||
ISRequirement.add(XS);
|
||||
|
||||
cm.addRequirements(EH120,EH120Requirement);
|
||||
cm.addRequirements(EH120, (HashSet<PartType>) EH120Requirement);
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user