Merge pull request #34 from ryanhamilton/use-latest-libraries

use-latest-libraries

Author: ViralBShah

java/pom.xml

@@ -9,12 +9,12 @@
       <dependency>
 		  <groupId>org.jblas</groupId>
 		  <artifactId>jblas</artifactId>
-		  <version>1.2.3</version>
+		  <version>1.2.4</version>
 	  </dependency>
 	  <dependency>
-		<groupId>com.googlecode.efficient-java-matrix-library</groupId>
-		<artifactId>ejml</artifactId>
-		<version>0.23</version>
+		<groupId>org.ejml</groupId>
+		<artifactId>ejml-simple</artifactId>
+		<version>0.37.1</version>
 	  </dependency>
   </dependencies>
   <build>

java/src/main/java/PerfPure.java

@@ -170,8 +170,8 @@ protected double sinc_sum(int n) {
     }
 
     private double randmatmul(int i) {
-        SimpleMatrix a = SimpleMatrix.random(i, i,  -1d, +1d, rand);
-        SimpleMatrix b = SimpleMatrix.random(i, i,  -1d, +1d, rand);
+        SimpleMatrix a = SimpleMatrix.random_DDRM(i, i,  -1d, +1d, rand);
+        SimpleMatrix b = SimpleMatrix.random_DDRM(i, i,  -1d, +1d, rand);
         return a.mult(b).get(0);
     }
 
@@ -182,10 +182,10 @@ private double[] randmatstat(int t) {
         SimpleMatrix v = new SimpleMatrix(new double[t][1]); //zeros(t,1);
         SimpleMatrix w = new SimpleMatrix(new double[t][1]); //zeros(t,1);
         for (int i=0; i < t; i++) {
-            SimpleMatrix a = SimpleMatrix.random(n, n,  -1d, +1d, rand);
-            SimpleMatrix b = SimpleMatrix.random(n, n,  -1d, +1d, rand);
-            SimpleMatrix c = SimpleMatrix.random(n, n,  -1d, +1d, rand);
-            SimpleMatrix d = SimpleMatrix.random(n, n,  -1d, +1d, rand);
+            SimpleMatrix a = SimpleMatrix.random_DDRM(n, n,  -1d, +1d, rand);
+            SimpleMatrix b = SimpleMatrix.random_DDRM(n, n,  -1d, +1d, rand);
+            SimpleMatrix c = SimpleMatrix.random_DDRM(n, n,  -1d, +1d, rand);
+            SimpleMatrix d = SimpleMatrix.random_DDRM(n, n,  -1d, +1d, rand);
 
             p.combine(0, 0*n, a);
             p.combine(0, 1*n, b);