diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f89d48c..194e554 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,9 @@
-
+
+
+
@@ -34,15 +36,15 @@
"RunOnceActivity.ShowReadmeOnStart": "true",
"git-widget-placeholder": "dev__v1",
"kotlin-language-version-configured": "true",
- "last_opened_file_path": "E:/M1/ALO/cartailor",
+ "last_opened_file_path": "C:/Users/vumin/Desktop/M1/ALO/cartailor",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"project.structure.last.edited": "SDKs",
- "project.structure.proportion": "0.0",
- "project.structure.side.proportion": "0.0",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.2",
"settings.editor.selected.configurable": "preferences.lookFeel",
"vue.rearranger.settings.migration": "true"
}
@@ -53,6 +55,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -70,6 +87,9 @@
1728547786554
+
+
+
diff --git a/src/fr/impl/CompatibilityManagerImpl.java b/src/fr/impl/CompatibilityManagerImpl.java
index ab8ed60..94b30e4 100644
--- a/src/fr/impl/CompatibilityManagerImpl.java
+++ b/src/fr/impl/CompatibilityManagerImpl.java
@@ -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");
}
diff --git a/src/fr/test/test.java b/src/fr/test/test.java
index cdf671f..f10e9c5 100644
--- a/src/fr/test/test.java
+++ b/src/fr/test/test.java
@@ -140,6 +140,7 @@ public class test {
cm.removeIncompatibility(XM, EG100);
assertFalse(cm.getIncompatibilities(XM).contains(EG100));
Set setEG100 = new HashSet();
+ System.out.println(setEG100.size());
setEG100.add(EG100);
cm.addIncompatibilities(XM, setEG100);
assertTrue(cm.getIncompatibilities(XM).contains(EG100));