From 82c9f268f8a25857aff9a47050eaecadd8f6d2c6 Mon Sep 17 00:00:00 2001
From: Minh VU <tuan-minh.vu@etudiant.univ-rennes1.fr>
Date: Thu, 24 Oct 2024 08:18:10 +0200
Subject: [PATCH] add transivity to incompatbile

---
 .idea/workspace.xml                       | 28 +++++++++++++++++++----
 src/fr/impl/CompatibilityManagerImpl.java | 23 ++++++++++++-------
 src/fr/test/test.java                     |  1 +
 3 files changed, 40 insertions(+), 12 deletions(-)

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 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="12bd6c53-8ba7-454c-a61e-7a76cc3b801b" name="Changes" comment="" />
+    <list default="true" id="12bd6c53-8ba7-454c-a61e-7a76cc3b801b" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -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 @@
       <recent name="C:\Users\vumin\Desktop\M1\ALO\cartailor" />
     </key>
   </component>
+  <component name="RunManager">
+    <configuration default="true" type="JetRunConfigurationType">
+      <module name="cartailor" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
+      <module name="cartailor" />
+      <option name="filePath" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+  </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
@@ -70,6 +87,9 @@
       <option name="presentableId" value="Default" />
       <updated>1728547786554</updated>
       <workItem from="1729254205656" duration="1151000" />
+      <workItem from="1729507889060" duration="386000" />
+      <workItem from="1729595321874" duration="25000" />
+      <workItem from="1729743145740" duration="122000" />
     </task>
     <servers />
   </component>
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 0f87174..5ba7b2b 100644
--- a/src/fr/test/test.java
+++ b/src/fr/test/test.java
@@ -130,6 +130,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(EG100, setEG100);
         System.out.println(cm.getIncompatibilities(XM) + "//////////");