Merge branch 'release/1.8.2'

miguelpinia · Jan 24, 2021 · 20d2d5a · 20d2d5a
2 parents 0742895 + b75bf32
commit 20d2d5a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mx.unam.imate</groupId>
     <artifactId>concurrentAlgorithms</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.8.2</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
@@ -44,6 +44,12 @@
             <artifactId>json</artifactId>
             <version>20200518</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/gnu.trove/trove -->
+        <dependency>
+          <groupId>gnu.trove</groupId>
+          <artifactId>trove</artifactId>
+          <version>3.0.3</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -115,6 +121,10 @@
             <id>java-net-repo</id>
             <url>https://maven.java.net/content/repositories/public/</url>
         </repository>
+        <repository>
+            <id>mvnrepository</id>
+            <url>http://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-releases/</url>
+        </repository>
     </repositories>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/org/mx/unam/imate/concurrent/algorithms/experiments/App.java b/src/main/java/org/mx/unam/imate/concurrent/algorithms/experiments/App.java
@@ -97,7 +97,9 @@ public void compareAlgs() {
             System.out.println(header);
             JSONObject results = exp.putSteals(types, putStealsOptions);
             System.out.println(results.toString(2));
-            WorkStealingUtils.saveJsonObjectToFile(results, "putsSteals.json");
+            SimpleDateFormat format = new SimpleDateFormat("dd_MM_yyyy-HH:mm:ss");
+            String time = format.format(new Date());
+            WorkStealingUtils.saveJsonObjectToFile(results, String.format("putsSteals-%s.json", time));
         }
         if (putTakes) {
             String header
@@ -108,7 +110,9 @@ public void compareAlgs() {
             System.out.println(header);
             JSONObject results = exp.putTakes(types, putTakesOptions);
             System.out.println(results.toString(2));
-            WorkStealingUtils.saveJsonObjectToFile(results, "putsTakes.json");
+            SimpleDateFormat format = new SimpleDateFormat("dd_MM_yyyy-HH:mm:ss");
+            String time = format.format(new Date());
+            WorkStealingUtils.saveJsonObjectToFile(results, String.format("putsTakes-%s.json", time));
         }
         if (putsTakesSteals) {
             String header
@@ -119,7 +123,9 @@ public void compareAlgs() {
             System.out.println(header);
             JSONObject results = exp.putTakesSteals(types, ptsOptions);
             System.out.println(results.toString(2));
-            WorkStealingUtils.saveJsonObjectToFile(results, "putsTakesSteals.json");
+            SimpleDateFormat format = new SimpleDateFormat("dd_MM_yyyy-HH:mm:ss");
+            String time = format.format(new Date());
+            WorkStealingUtils.saveJsonObjectToFile(results, String.format("putsTakesSteals-%s.json", time));
         }
         if (spanningTree) {
             String header

diff --git a/src/main/java/org/mx/unam/imate/concurrent/datastructures/graph/Vertex.java b/src/main/java/org/mx/unam/imate/concurrent/datastructures/graph/Vertex.java
@@ -1,7 +1,12 @@
 package org.mx.unam.imate.concurrent.datastructures.graph;
 
+import gnu.trove.list.TIntList;
+import gnu.trove.list.array.TIntArrayList;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Represent the vertex of a graph. Use a <b>List</b> to store its neighbours,
@@ -15,14 +20,14 @@ public class Vertex {
 
     private final boolean directed;
     private final Integer value;
-    private final List<Integer> neighbours;
-    private final List<Integer> childs;
+    private final TIntList neighbours;
+    private final TIntList childs;
 
     public Vertex(boolean directed, Integer value) {
         this.directed = directed;
         this.value = value;
-        this.neighbours = new ArrayList<>();
-        this.childs = directed ? new ArrayList<>() : null;
+        this.neighbours = new TIntArrayList();
+        this.childs = directed ? new TIntArrayList() : null;
     }
 
     public boolean isDirected() {
@@ -34,11 +39,17 @@ public Integer getValue() {
     }
 
     public List<Integer> getNeighbours() {
-        return neighbours;
+        List<Integer> result = Arrays.stream(neighbours.toArray())
+            .boxed()
+            .collect(Collectors.toList());
+        return result;
     }
 
     public List<Integer> getChilds() {
-        return childs;
+        List<Integer> result = Arrays.stream(childs.toArray())
+            .boxed()
+            .collect(Collectors.toList());
+        return result;
     }
 
     public void addNeighbour(int neighbour) {