Skip to content
Commits on Source (4)
<component name="CopyrightManager">
<copyright>
<option name="notice" value="Copyright (c) 2009-2019, Peter Abeles. All Rights Reserved.&#10;&#10;This file is part of Efficient Java Matrix Library (EJML).&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10; http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
<option name="myName" value="ejml" />
<option name="notice" value="Copyright (c) 2009-2018, Peter Abeles. All Rights Reserved.&#10;&#10;This file is part of Efficient Java Matrix Library (EJML).&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10; http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
</copyright>
</component>
\ No newline at end of file
......@@ -44,7 +44,7 @@ EJML is in Maven central repository and can easily be added to Gradle, Maven, an
```
<groupId>org.ejml</groupId>
<artifactId>ejml-all</artifactId>
<version>0.37.1</version>
<version>0.38</version>
```
This will add the entire library. Alternatively, you can include the required modules individually:
......
plugins {
id "com.peterabeles.gversion" version "1.3.0"
id "com.peterabeles.gversion" version "1.4.1"
}
gversion {
......@@ -13,7 +13,7 @@ allprojects {
apply plugin: 'eclipse'
group = 'org.ejml'
version = '0.37.1'
version = '0.38'
}
subprojects {
......@@ -91,6 +91,7 @@ subprojects {
['core','generator-annprocess'].each { String a->
benchmarkCompile('org.openjdk.jmh:jmh-'+a+':1.19')
}
generateCompile project(':main:autocode')
}
jar {
......
......@@ -2,6 +2,24 @@ Change log for EJML
Date format: year/month/day
----- Version 0.38
2019/03/13
- Examples
* Added sparse performance tips
- SimpleOperations
* Added multTransA
* Added another variant of plus
- Created SimpleSparseOperations
* Operations specific to sparse matrices
- CommonOps_DDRM
* Added symmLowerToFull and symmUpperToFull
* Added divideRowsCols
* Added abs() Thanks Víctor Fernández for the pull request
- GrowArray
* Clarified meaning of grow() by renaming it growInternal() Thanks Florian Enner for pointing out the problem
- Added Matrix.zero() so that all matrices now implement zero()
----- Version 0.37.1
2018/12/25
......
libejml-java (0.37.1-1) UNRELEASED; urgency=medium
libejml-java (0.38+ds-1) UNRELEASED; urgency=medium
* Team upload.
[ Andreas Tille ]
* New upstream version
* debhelper 12
* Standards-Version: 4.3.0
* Point Vcs-fields to Salsa
......@@ -12,7 +13,20 @@ libejml-java (0.37.1-1) UNRELEASED; urgency=medium
[ Vincent Privat ]
* d/rules: s+gradle+./gradlew+
-- Andreas Tille <tille@debian.org> Sat, 12 Jan 2019 08:51:56 +0100
[ Andrius Merkys ]
* New upstream version 0.38+ds
* Adding a patch to use local maven repository.
* Adding a patch to turn off example compilation, as it fails.
* Relying on gradle buildsystem to build the package.
* Using maven-repo-helper to correct gversion's artifactId.
* Adding b-deps on gversion gradle plugin and libauto64fto32f-java.
* Listing all the poms and their jars in debian/libejml-java.poms.
* Removing debian/libejml-java.jlibs, as jars are now installed by
debian/libejml-java.pom.
* ManualEJML.pdf is no longer present.
* Removing all generated java files.
-- Andrius Merkys <merkys@debian.org> Wed, 15 May 2019 10:45:10 -0400
libejml-java (0.28-1) unstable; urgency=low
......
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Contact: Peter Abeles <peter.abeles@gmail.com>
Source: https://github.com/lessthanoptimal/ejml
Files-Excluded:
gradle*
Comment: Removing unneeded files.
Files: *
Copyright: 2009-2015 Peter Abeles <peter.abeles@gmail.com>
......
version=3
version=4
opts="repack,repacksuffix=+ds,dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//" \
https://github.com/lessthanoptimal/ejml/releases .*/archive/v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
/*
* Copyright (c) 2009-2017, Peter Abeles. All Rights Reserved.
* Copyright (c) 2009-2019, Peter Abeles. All Rights Reserved.
*
* This file is part of Efficient Java Matrix Library (EJML).
*
......@@ -44,6 +44,9 @@ public class ExampleSparseMatrix {
Random rand = new Random(234);
// easy to work with sparse format, but hard to do computations with
// NOTE: It is very important to you set 'initLength' to the actual number of elements in the final array
// If you don't it will be forced to thrash memory as it grows its internal data structures.
// Failure to heed this advice will make construction of large matrices 4x slower and use 2x more memory
DMatrixSparseTriplet work = new DMatrixSparseTriplet(5,4,5);
work.addItem(0,1,1.2);
work.addItem(3,0,3);
......
org.gradle.parallel=true
\ No newline at end of file
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
#!/usr/bin/env sh
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
/*
* Copyright (c) 2009-2018, Peter Abeles. All Rights Reserved.
* Copyright (c) 2009-2019, Peter Abeles. All Rights Reserved.
*
* This file is part of Efficient Java Matrix Library (EJML).
*
......@@ -32,7 +32,7 @@ public abstract class CodeGeneratorBase {
public static final String copyright =
"/*\n" +
" * Copyright (c) 2009-2018, Peter Abeles. All Rights Reserved.\n" +
" * Copyright (c) 2009-2019, Peter Abeles. All Rights Reserved.\n" +
" *\n" +
" * This file is part of Efficient Java Matrix Library (EJML).\n" +
" *\n" +
......
/*
* Copyright (c) 2009-2018, Peter Abeles. All Rights Reserved.
* Copyright (c) 2009-2019, Peter Abeles. All Rights Reserved.
*
* This file is part of Efficient Java Matrix Library (EJML).
*
......@@ -65,8 +65,9 @@ public class GenerateMatrixFixedN extends CodeGeneratorBase{
" public "+className+"("+className+" o) {\n");
printSetFromParam(dimen,"o.");
out.print(" }\n" +
"\n" +
" public void set(");
"\n");
printZero(dimen);
out.print(" public void set(");
printFunctionParam(dimen);
out.print(")\n" +
" {\n");
......@@ -221,6 +222,16 @@ public class GenerateMatrixFixedN extends CodeGeneratorBase{
}
}
private void printZero( int dimen ) {
out.print(
" @Override\n" +
" public void zero() {\n");
for( int y = 1; y <= dimen; y++ ) {
out.println(" a"+y+" = 0.0;");
}
out.print(" }\n\n");
}
public static void main( String args[] ) throws FileNotFoundException {
GenerateMatrixFixedN app = new GenerateMatrixFixedN();
......
/*
* Copyright (c) 2009-2018, Peter Abeles. All Rights Reserved.
* Copyright (c) 2009-2019, Peter Abeles. All Rights Reserved.
*
* This file is part of Efficient Java Matrix Library (EJML).
*
......@@ -65,6 +65,7 @@ public class GenerateMatrixFixedNxN extends CodeGeneratorBase{
printSetFromParam(dimen, "o.");
out.print(" }\n" +
"\n");
printZero(dimen);
out.print(" public void set");
printFunctionParam(21,dimen);
out.print(" {\n");
......@@ -244,6 +245,20 @@ public class GenerateMatrixFixedNxN extends CodeGeneratorBase{
out.print(" }\n\n");
}
private void printZero( int dimen ) {
out.print(
" @Override\n" +
" public void zero() {\n");
for( int y = 1; y <= dimen; y++ ) {
out.print(" ");
for( int x = 1; x <= dimen; x++ ) {
out.print(" a"+y+""+x+" = 0.0;");
}
out.println();
}
out.print(" }\n\n");
}
public static void main( String args[] ) throws FileNotFoundException {
GenerateMatrixFixedNxN app = new GenerateMatrixFixedNxN();
......
/*
* Copyright (c) 2009-2018, Peter Abeles. All Rights Reserved.
* Copyright (c) 2009-2019, Peter Abeles. All Rights Reserved.
*
* This file is part of Efficient Java Matrix Library (EJML).
*
......@@ -55,4 +55,11 @@ public class FancyPrint {
return UtilEjml.fancyString(value,format,length,significant);
}
/**
* Fancy print without a space added to positive numbers
*/
public String p(double value ) {
return UtilEjml.fancyString(value,format,false,length,significant);
}
}
/*
* Copyright (c) 2009-2019, Peter Abeles. All Rights Reserved.
*
* This file is part of Efficient Java Matrix Library (EJML).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.ejml;
import org.ejml.data.Matrix;
import org.ejml.interfaces.decomposition.DecompositionInterface;
import org.ejml.interfaces.linsol.LinearSolverDense;
import org.ejml.interfaces.linsol.LinearSolverSparse;
/**
* Wrapper which allows a regular linear solver to act like a sparse solver
*
* @author Peter Abeles
*/
public class LinearSolverToSparse<D extends Matrix>
implements LinearSolverSparse<D,D>
{
LinearSolverDense<D> solver;
// locking the structure has no meaning, but need to meet the contract
boolean locked=false;
public LinearSolverToSparse(LinearSolverDense<D> solver) {
this.solver = solver;
}
@Override
public void solveSparse(D B, D X) {
solver.solve(B,X);
}
@Override
public void setStructureLocked(boolean locked) {
this.locked = locked;
}
@Override
public boolean isStructureLocked() {
return locked;
}
@Override
public boolean setA(D A) {
return solver.setA(A);
}
@Override
public double quality() {
return solver.quality();
}
@Override
public void solve(D B, D X) {
solver.solve(B,X);
}
@Override
public boolean modifiesA() {
return solver.modifiesA();
}
@Override
public boolean modifiesB() {
return solver.modifiesB();
}
@Override
public <D1 extends DecompositionInterface> D1 getDecomposition() {
return solver.getDecomposition();
}
}
/*
* Copyright (c) 2009-2018, Peter Abeles. All Rights Reserved.
* Copyright (c) 2009-2019, Peter Abeles. All Rights Reserved.
*
* This file is part of Efficient Java Matrix Library (EJML).
*
......@@ -351,16 +351,21 @@ public class UtilEjml {
public static String fancyString(double value, DecimalFormat format, int length, int significant) {
return fancyString(value,format,true,length,significant);
}
public static String fancyString(double value, DecimalFormat format, boolean hasSpace , int length, int significant) {
String formatted;
// see if the number is negative. Including negative zero
boolean isNegative = Double.doubleToRawLongBits(value) < 0;
if( value == 0 ) {
formatted = isNegative ? "-0" : " 0";
formatted = isNegative ? "-0" : hasSpace ? " 0": "0";
} else {
int digits = length-1;
String extraSpace = isNegative ? "":" ";
String extraSpace = isNegative ? "": hasSpace ? " ": "";
double vabs = Math.abs(value);
int a = (int) Math.floor(Math.log10(vabs));
if (a >= 0 && a < digits) {
......@@ -381,4 +386,32 @@ public class UtilEjml {
}
return formatted;
}
/**
* Resizes the array to ensure that it is at least of length desired and returns its internal array
*/
public static int[] adjust(IGrowArray gwork, int desired) {
if (gwork == null) gwork = new IGrowArray();
gwork.reshape(desired);
return gwork.data;
}
public static int[] adjust(IGrowArray gwork, int desired, int zeroToM) {
int[] w = adjust(gwork,desired);
Arrays.fill(w,0,zeroToM,0);
return w;
}
public static int[] adjustClear(IGrowArray gwork, int desired) {
return adjust(gwork,desired,desired);
}
/**
* Resizes the array to ensure that it is at least of length desired and returns its internal array
*/
public static double[] adjust(DGrowArray gwork, int desired) {
if (gwork == null) gwork = new DGrowArray();
gwork.reshape(desired);
return gwork.data;
}
}
/*
* Copyright (c) 2009-2018, Peter Abeles. All Rights Reserved.
* Copyright (c) 2009-2019, Peter Abeles. All Rights Reserved.
*
* This file is part of Efficient Java Matrix Library (EJML).
*
......@@ -130,6 +130,11 @@ public class BMatrixRMaj implements ReshapeMatrix {
return numCols;
}
@Override
public void zero() {
Arrays.fill(data, 0, getNumElements(), false);
}
@Override
public <T extends Matrix> T copy() {
BMatrixRMaj ret = new BMatrixRMaj(numRows,numCols);
......