diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 92a6a72526a201cdf0db97d00ff6fc61ff02f1a4..2a65317ef840e02bf2375483aba5bdca996fc1b3 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -9,7 +9,6 @@ <option name="modules"> <set> <option value="$PROJECT_DIR$" /> - <option value="$PROJECT_DIR$/../amak" /> </set> </option> </GradleProjectSettings> diff --git a/build.gradle b/build.gradle index 2b938bc17d617dc38d6a73c9514f8acbc4170a8f..98f190c52cb32fb043dde1bfd598afcc3a2f1893 100644 --- a/build.gradle +++ b/build.gradle @@ -8,12 +8,13 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { url "https://jitpack.io" } } dependencies { // AMAK (Only one of the next two lines should be uncommented. Also, settings.gradle file should also be modified) - // implementation 'com.github.alexandreprl:amak:v3-SNAPSHOT'// Uncomment this line to get AMAK from git repository (The last part matches a tag, a commit hash or the last commit of a branch : branchName-SNAPSHOT - implementation project(':amak') // Uncomment this line to get AMAK from local + implementation 'com.github.alexandreprl:amak:3.0.4'// Uncomment this line to get AMAK from git repository (The last part matches a tag, a commit hash or the last commit of a branch : branchName-SNAPSHOT +// implementation project(':amak') // Uncomment this line to get AMAK from local testImplementation platform('org.junit:junit-bom:5.9.1') testImplementation 'org.junit.jupiter:junit-jupiter' diff --git a/settings.gradle b/settings.gradle index af11a34e8c747c5226ae353e5c58d4cec3d82c11..751f796d2b7a7a131bb790a9d57e6df92860f948 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ rootProject.name = 'CluMATE' // Uncomment the two next lines when building amak locally -include ':amak' -project(':amak').projectDir = new File(settingsDir, '../amak') \ No newline at end of file +//include ':amak' +//project(':amak').projectDir = new File(settingsDir, '../amak') \ No newline at end of file diff --git a/src/main/java/fr/irit/smac/clumate/amas/ClusterAgent.java b/src/main/java/fr/irit/smac/clumate/amas/ClusterAgent.java index 28fae1f4765ef82f346240d4ac0291e72c3e2d3b..0840cf14edab83bb07f8e81a2789a009e79c74b4 100644 --- a/src/main/java/fr/irit/smac/clumate/amas/ClusterAgent.java +++ b/src/main/java/fr/irit/smac/clumate/amas/ClusterAgent.java @@ -123,8 +123,9 @@ public class ClusterAgent<T extends DataPoint> extends Agent<ClusterAMAS<T>, Clu switch (state) { case DORMANT -> { decideToDie = false; - if (receivedClusterForRequestSimilarity == null) { + if (receivedClusterForRequestSimilarity == null && amas.getMasSettings().amasOptions().contains(AMASOption.Forget)) { // TODO decide to die logic + } } case DECIDING -> {