model comparator checks set of miriam data

model/src/main/java/lcsb/mapviewer/model/map/model/ModelComparator.java

@@ -13,6 +13,8 @@ import lcsb.mapviewer.common.comparator.DoubleComparator;
 import lcsb.mapviewer.common.comparator.IntegerComparator;
 import lcsb.mapviewer.common.comparator.SetComparator;
 import lcsb.mapviewer.common.comparator.StringComparator;
+import lcsb.mapviewer.model.map.MiriamData;
+import lcsb.mapviewer.model.map.MiriamDataComparator;
 import lcsb.mapviewer.model.map.kinetics.SbmlFunction;
 import lcsb.mapviewer.model.map.kinetics.SbmlFunctionComparator;
 import lcsb.mapviewer.model.map.kinetics.SbmlParameter;
@@ -148,6 +150,17 @@ public class ModelComparator extends Comparator<Model> {
       logger.debug("parameters different");
       return status;
     }
+
+    SetComparator<MiriamData> miriamDataSetComparator = new SetComparator<>(new MiriamDataComparator());
+
+    status = miriamDataSetComparator.compare(arg0.getMiriamData(), arg1.getMiriamData());
+    if (status != 0) {
+      logger.debug("miriam data different");
+      logger.debug(arg0.getMiriamData());
+      logger.debug(arg1.getMiriamData());
+      return status;
+    }
+
     return 0;
   }
 

model/src/main/java/lcsb/mapviewer/model/map/reaction/ReactionComparator.java

 package lcsb.mapviewer.model.map.reaction;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import org.apache.log4j.Logger;
 
 import lcsb.mapviewer.common.Comparator;
@@ -13,7 +10,6 @@ import lcsb.mapviewer.common.comparator.IntegerComparator;
 import lcsb.mapviewer.common.comparator.SetComparator;
 import lcsb.mapviewer.common.comparator.StringComparator;
 import lcsb.mapviewer.common.comparator.StringListComparator;
-import lcsb.mapviewer.common.comparator.StringSetComparator;
 import lcsb.mapviewer.model.map.MiriamData;
 import lcsb.mapviewer.model.map.MiriamDataComparator;
 import lcsb.mapviewer.model.map.kinetics.SbmlKineticsComparator;

model/src/test/java/lcsb/mapviewer/model/map/model/ModelComparatorTest.java

@@ -415,4 +415,21 @@ public class ModelComparatorTest {
     }
   }
 
+  @Test
+  public void testCompareAnnotations() throws Exception {
+    try {
+      Model model1 = getModel();
+      Model model2 = getModel();
+      model1.addMiriamData(new MiriamData(MiriamType.CHEBI, "CHEBI:12345"));
+      assertTrue("Models have different annotations", comparator.compare(model1, model2) != 0);
+      assertTrue(comparator.compare(model2, model1) != 0);
+      model2.addMiriamData(new MiriamData(MiriamType.CHEBI, "CHEBI:12345"));
+      assertEquals(0, comparator.compare(model1, model2));
+      assertEquals(0, comparator.compare(model2, model1));
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw e;
+    }
+  }
+
 }