vuminh224/cartailor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_v1' of https://gitlab.istic.univ-rennes1.fr/trochas/cartailor into dev_v1

Browse Source
This commit is contained in:
trochas
2024-10-24 10:20:51 +02:00
parent 9bf322af6a 82c9f268f8
commit df189bf44c
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/fr/impl/CompatibilityManagerImpl.java
View File

@@ -28,6 +28,7 @@ public class CompatibilityManagerImpl implements src.fr.api.CompatibilityManager
if(incompa.isEmpty()){
incompatibilities.put(reference, target);
}else {
for(PartType x: target){
if (incompa.contains(x)){
@@ -39,10 +40,11 @@ public class CompatibilityManagerImpl implements src.fr.api.CompatibilityManager
//Ajout ref à x
incompa.add(x);
System.out.println("Add "+reference.getName() +" incompatible with "+x.getName());
// Symétrie
//Ajoute x à ref
this.getIncompatibilities(x).add(reference);
System.out.println("Add "+x.getName() +" incompatible with "+reference.getName());
//this.getIncompatibilities(x).add(reference);
//System.out.println("Add "+x.getName() +" incompatible with "+reference.getName());
}
}
}
@@ -61,8 +63,10 @@ public class CompatibilityManagerImpl implements src.fr.api.CompatibilityManager
}else{
if(incompa.contains(target)){
incompa.remove(target);
// SyMéTrIe
//Remove target -> ref
this.getIncompatibilities(target).remove(reference);
//this.getIncompatibilities(target).remove(reference);
}else {
System.out.println("This part doesn't exist in incompatibilities list");
}
@@ -90,10 +94,11 @@ public class CompatibilityManagerImpl implements src.fr.api.CompatibilityManager
//Ajout ref à x
require.add(x);
System.out.println("Add "+reference.getName() +" compatible with "+x.getName());
//Symétrie
//Ajoute x à ref
this.getRequirements(x).add(reference);
System.out.println("Add "+x.getName() +" compatible with "+reference.getName());
//this.getRequirements(x).add(reference);
//System.out.println("Add "+x.getName() +" compatible with "+reference.getName());
}
}
}
@@ -113,8 +118,10 @@ public class CompatibilityManagerImpl implements src.fr.api.CompatibilityManager
}else{
if(require.contains(target)){
require.remove(target);
// SyMéTrIe
//Remove target -> ref
this.getRequirements(target).remove(reference);
//this.getRequirements(target).remove(reference);
}else {
System.out.println("This part doesn't exist in compatibilities list");
}

1
src/fr/test/test.java
View File

@@ -140,6 +140,7 @@ public class test {
cm.removeIncompatibility(XM, EG100);
assertFalse(cm.getIncompatibilities(XM).contains(EG100));
Set<PartType> setEG100 = new HashSet<PartType>();
System.out.println(setEG100.size());
setEG100.add(EG100);
cm.addIncompatibilities(XM, setEG100);
assertTrue(cm.getIncompatibilities(XM).contains(EG100));