diff --git a/src/CompatibilityChecker.java b/src/CompatibilityChecker.java index 62a775f..88552cb 100644 --- a/src/CompatibilityChecker.java +++ b/src/CompatibilityChecker.java @@ -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> incompatibilities; @@ -14,7 +13,6 @@ public class CompatibilityChecker implements fr.istic.nplouzeau.cartaylor.api.Co public CompatibilityChecker( HashMap> incompatibilities, HashMap> requirements){ this.incompatibilities=incompatibilities; this.requirements= requirements; - } @Override diff --git a/src/CompatibilityManager.java b/src/CompatibilityManager.java index 798c073..be0b4ce 100644 --- a/src/CompatibilityManager.java +++ b/src/CompatibilityManager.java @@ -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 getRequirements(PartType reference) { return this.requirements.get(reference); } + + public void addRequirements(src.PartType eH120, HashSet eH120Requirement) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'addRequirements'"); + } } \ No newline at end of file diff --git a/src/Configuration.java b/src/Configuration.java index 3f804cf..f175773 100644 --- a/src/Configuration.java +++ b/src/Configuration.java @@ -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; diff --git a/tests/test.java b/tests/test.java index 1bbf204..0ea8c70 100644 --- a/tests/test.java +++ b/tests/test.java @@ -71,7 +71,7 @@ public class test { Set ISRequirement = new HashSet(); ISRequirement.add(XS); - cm.addRequirements(EH120,EH120Requirement); + cm.addRequirements(EH120, (HashSet) EH120Requirement); }