From f7a38ed269b8bd36d9e2fd2a0a546f3d12831b85 Mon Sep 17 00:00:00 2001 From: Ryan Hamilton Date: Sat, 23 Feb 2019 16:19:05 +0000 Subject: [PATCH] use-latest-libraries --- java/pom.xml | 8 ++++---- java/src/main/java/PerfPure.java | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 125d5e1..5f93d75 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -9,12 +9,12 @@ org.jblas jblas - 1.2.3 + 1.2.4 - com.googlecode.efficient-java-matrix-library - ejml - 0.23 + org.ejml + ejml-simple + 0.37.1 diff --git a/java/src/main/java/PerfPure.java b/java/src/main/java/PerfPure.java index 25e26a5..b045e0b 100644 --- a/java/src/main/java/PerfPure.java +++ b/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);