Fix infinite loop, Add lastModified field in db

src/main/java/fr/irit/smac/amas4dc/amas/agent/ClusterAgent.java

@@ -148,6 +148,7 @@ public class ClusterAgent<T extends DataPoint> extends Agent<DynamicClusteringAM
 					}
 					if (!otherSimilarClusterAgents.isEmpty()) {
 						this.requestDistanceMessageSentAgents.clear();
+						distancesReceived.clear();
 						this.requestDistanceMessageSentAgents.addAll(otherSimilarClusterAgents);
 						nextState = State.WAITING_FOR_DISTANCE;
 					} else {
@@ -209,7 +210,6 @@ public class ClusterAgent<T extends DataPoint> extends Agent<DynamicClusteringAM
 			logger.info(this + " absorbs the data point " + otherDataPoint);
 
 		T newRepresentative = (T) amas.getMasSettings().dataPointFuser().apply(cluster.getRepresentative(), otherDataPoint);
-		cluster.setRepresentative(newRepresentative);
 		cluster.addDataPoint(otherDataPoint);
 	}
 
@@ -217,15 +217,14 @@ public class ClusterAgent<T extends DataPoint> extends Agent<DynamicClusteringAM
 		if (logger.isLoggable(Level.INFO))
 			logger.info(this + " absorbs the cluster " + otherCluster);
 
-		T newRepresentative = (T) amas.getMasSettings().dataPointFuser().apply(cluster.getRepresentative(), otherCluster.getRepresentative());
+		amas.getMasSettings().dataPointFuser().apply(cluster.getRepresentative(), otherCluster.getRepresentative());
 
-		cluster.setRepresentative(newRepresentative);
 
 		if (getAmas().getMasSettings().amasOptions().contains(AMASOption.KeepAllDataPoints))
 			((ExtendedCluster<T>) cluster).addClusterContent((ExtendedCluster<T>) otherCluster);
 		else
 			cluster.addClusterContent(otherCluster);
-
+		amas.getMasSettings().database().setLastModifiedDataPoint(cluster.getRepresentative());
 	}
 
 	@Override

src/main/java/fr/irit/smac/amas4dc/amas/agent/DataPointAgent.java

@@ -25,7 +25,7 @@ public class DataPointAgent<T extends DataPoint> extends Agent<DynamicClustering
 	public DataPointAgent(DynamicClusteringAMAS<T> amas, T dataPoint) {
 		super(amas);
 		if (logger.isLoggable(Level.INFO))
-			logger.info(this + " created");
+			logger.info(this + " created for datapoint "+dataPoint);
 		this.dataPoint = dataPoint;
 	}
 

src/main/java/fr/irit/smac/amas4dc/cluster/Cluster.java

@@ -14,7 +14,7 @@ import java.util.UUID;
 public class Cluster<T extends DataPoint> {
 	@Getter
 	@Setter
-	private T representative;
+	private final T representative;
 	@Getter
 	private int size;
 

src/main/java/fr/irit/smac/amas4dc/cluster/DataPointDatabase.java

 package fr.irit.smac.amas4dc.cluster;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class DataPointDatabase<T extends DataPoint> {
-	private List<T> content = new ArrayList<>();
+	private static final Logger logger = Logger.getLogger(DataPointDatabase.class.getName());
+	private Set<T> content = new HashSet<>();
+	private T lastModifiedDataPoint;
+
 	public void add(T newDataPoint) {
+		if (logger.isLoggable(Level.INFO))
+			logger.info("Adding an element to database");
 		content.add(newDataPoint);
 	}
 
@@ -14,11 +19,16 @@ public class DataPointDatabase<T extends DataPoint> {
 		content.remove(dataPoint);
 	}
 
-	public List<T> get() {
-		return Collections.unmodifiableList(content);
+	public Set<T> get() {
+		return content;
 	}
 
 	public boolean contains(T dataPoint) {
 		return content.contains(dataPoint);
 	}
+
+	public void setLastModifiedDataPoint(T dataPoint) {
+
+		this.lastModifiedDataPoint = dataPoint;
+	}
 }

src/test/groovy/SimpleClusteringIT.groovy

@@ -2,21 +2,24 @@ import fr.irit.smac.amas4dc.AMAS4DC
 import fr.irit.smac.amas4dc.amas.AMASOption
 import fr.irit.smac.amas4dc.amas.MASSettings
 import fr.irit.smac.amas4dc.cluster.DataPoint
+import fr.irit.smac.amas4dc.cluster.DataPointDatabase
 import fr.irit.smac.amas4dc.cluster.DistanceMethod
 import spock.lang.Specification
 
 class SimpleClusteringIT extends Specification {
 	def "Clustering of two similar 1D objects"() {
+		def database = new DataPointDatabase<OneDDataPoint>()
 		given:
 		def amas4dc = new AMAS4DC<OneDDataPoint>(new MASSettings(new OneDDistanceMethod(), 1f, EnumSet.noneOf(AMASOption), (OneDDataPoint dp1, OneDDataPoint dp2) -> {
 			return new OneDDataPoint(dp1.value + (dp2.value - dp1.value) * 0.1f)
-		}))
+		}, database))
 
 		when:
 		amas4dc.fit([new OneDDataPoint(1), new OneDDataPoint(2)])
 		var results = amas4dc.retrieveClusters()
 
 		then:
+		database.get().size() == results.clusters().size()
 		results.clusters().size() == 1
 		results.clusters().get(0).getSize() == 2
 	}