- Nuiton-matrix-commits - mailman.cloud.codelutin.com

r474 - trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix
by bpoussin＠users.nuiton.org April 10, 2014

April 10, 2014

Author: bpoussin Date: 2014-04-10 20:32:50 +0200 (Thu, 10 Apr 2014) New Revision: 474 Url: http://forge.nuiton.org/projects/nuiton-matrix/repository/revisions/474 Log: add test for LazyVector Added: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/LazyVectorTest.java Added: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/LazyVectorTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/LazyVectorTest.java (rev 0) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/LazyVectorTest.java 2014-04-10 18:32:50 UTC (rev 474) @@ -0,0 +1,50 @@ +package org.nuiton.math.matrix; + + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class LazyVectorTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(LazyVectorTest.class); + + @Test + public void testCopy() { + LazyVector l1 = new LazyVector(new DoubleBigVector(), 10); + LazyVector l2 = new LazyVector(new DoubleBigVector(), 10); + + l2.paste(l1); + + l1.setValue(5, 5); + l2.setValue(5, -5); + + Assert.assertEquals(5, l1.getValue(5), 0); + Assert.assertEquals(-5, l2.getValue(5), 0); + + LazyVector l3 = new LazyVector(new DoubleBigVector(), 10); + l3.paste(l1); + + l1.setValue(5, -5); + + Assert.assertEquals(-5, l1.getValue(5), 0); + Assert.assertEquals(5, l3.getValue(5), 0); + + l3.setValue(4, 4); + + Assert.assertEquals(-5, l1.getValue(5), 0); + Assert.assertEquals(5, l3.getValue(5), 0); + Assert.assertEquals(0, l1.getValue(4), 0); + Assert.assertEquals(4, l3.getValue(4), 0); + } +} Property changes on: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/LazyVectorTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r473 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by bpoussin＠users.nuiton.org April 10, 2014

April 10, 2014

Author: bpoussin Date: 2014-04-10 20:21:54 +0200 (Thu, 10 Apr 2014) New Revision: 473 Url: http://forge.nuiton.org/projects/nuiton-matrix/repository/revisions/473 Log: rewrite LazyVector to support concurrent modification (CopyOnWrite) Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java 2014-04-10 13:41:07 UTC (rev 472) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java 2014-04-10 18:21:54 UTC (rev 473) @@ -1,6 +1,13 @@ package org.nuiton.math.matrix; +import java.util.ConcurrentModificationException; +import java.util.IdentityHashMap; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.commons.collections4.set.MapBackedSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,8 +31,8 @@ protected boolean isInitBackend = false; /** reel backend, not initialized since not necessary */ protected Vector backend; - /** vector used when paste is called and backend is not initialized */ - protected Vector copy; + protected AtomicInteger users = new AtomicInteger(); + protected int capacity; public LazyVector(Vector backend, int capacity) { @@ -47,8 +54,6 @@ double result = 0; if (isInitBackend) { result = backend.getMaxOccurrence(); - } else if (copy != null) { - result = copy.getMaxOccurrence(); } return result; } @@ -58,15 +63,13 @@ double result = 0; if (isInitBackend) { result = backend.getValue(pos); - } else if (copy != null) { - result = copy.getValue(pos); } return result; } @Override public void setValue(int pos, double value) { - initBackend(); + prepareBackendForModification(); backend.setValue(pos, value); } @@ -97,31 +100,36 @@ @Override public void paste(Vector source) { - if (!isInitBackend && copy == null) { - copy = source; + if (!isInitBackend && source instanceof LazyVector) { + LazyVector l = ((LazyVector)source); + + l.users.incrementAndGet(); + users = l.users; + isInitBackend = l.isInitBackend; + backend = l.backend; } else { // initialized or already has copy, we need to paste, and not just // reassign copy variable, in case of source Vector is smaller than copy - initBackend(); - pasteToBackend(source); + prepareBackendForModification(); + pasteToBackend(backend, source); } } @Override public void add(Vector v) { - initBackend(); + prepareBackendForModification(); backend.add(v); } @Override public void minus(Vector v) { - initBackend(); + prepareBackendForModification(); backend.minus(v); } @Override public void map(MapFunction f) { - initBackend(); + prepareBackendForModification(); backend.map(f); } @@ -133,9 +141,7 @@ if (size() == v.size()) { if (isInitBackend) { result = v.equals(backend); - } else if (copy != null) { - result = v.equals(copy); - } else if (v instanceof LazyVector && !((LazyVector)v).isInitBackend && ((LazyVector)v).copy == null) { + } else if (v instanceof LazyVector && !((LazyVector)v).isInitBackend) { result = true; } else { result = v.equals(this); @@ -145,36 +151,41 @@ return result; } - protected void initBackend() { + protected void prepareBackendForModification() { + if (users.get() > 0) { + try { + // others LazyVector use this backend, create new backend copy + Vector copy = backend.getClass().newInstance(); + if (isInitBackend) { + copy.init(capacity); + pasteToBackend(copy, backend); + } + backend = copy; + users.decrementAndGet(); + users = new AtomicInteger(); + } catch (Exception eee) { + throw new MatrixException("Can't create new backend Vector", eee); + } + } + if (!isInitBackend) { backend.init(capacity); isInitBackend = true; - if (copy != null) { - pasteToBackend(copy); - } } } /** * Before call this method backend, must be initialized + * @param target * @param copy */ - protected void pasteToBackend(Vector copy) { - if (copy instanceof LazyVector) { - LazyVector l = (LazyVector)copy; - if (l.isInitBackend) { - copy = l.backend; - } else if (l.copy != null) { - copy = l.copy; - } - } - - if (backend.isImplementedPaste(copy)) { - backend.paste(copy); + protected void pasteToBackend(Vector target, Vector copy) { + if (target.isImplementedPaste(copy)) { + target.paste(copy); } else { for (int i=0, max=Math.min(size(), copy.size()); i<max; i++) { double v = copy.getValue(i); - backend.setValue(i, v); + target.setValue(i, v); } } }

1 0

r472 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by bpoussin＠users.nuiton.org April 10, 2014

April 10, 2014

Author: bpoussin Date: 2014-04-10 15:41:07 +0200 (Thu, 10 Apr 2014) New Revision: 472 Url: http://forge.nuiton.org/projects/nuiton-matrix/repository/revisions/472 Log: enhance paste method for LazyVector Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java 2014-04-10 12:44:04 UTC (rev 471) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java 2014-04-10 13:41:07 UTC (rev 472) @@ -148,14 +148,27 @@ protected void initBackend() { if (!isInitBackend) { backend.init(capacity); + isInitBackend = true; if (copy != null) { pasteToBackend(copy); } - isInitBackend = true; } } + /** + * Before call this method backend, must be initialized + * @param copy + */ protected void pasteToBackend(Vector copy) { + if (copy instanceof LazyVector) { + LazyVector l = (LazyVector)copy; + if (l.isInitBackend) { + copy = l.backend; + } else if (l.copy != null) { + copy = l.copy; + } + } + if (backend.isImplementedPaste(copy)) { backend.paste(copy); } else {

1 0

Build failed in Jenkins: nuiton-matrix-ci #5
by admin+ci-nuiton.org＠codelutin.com April 10, 2014

April 10, 2014

See <http://ci.nuiton.org/jenkins/job/nuiton-matrix-ci/5/changes> Changes: [Tony CHEMIT] fixes #3091 + refs #3088 ------------------------------------------ [...truncated 486 lines...] linearFactor = [ 2,1,1, ] dimensions = [ 3,2,1, ] matrice = [ 1.0E-7,0.0,0.0,2.0,0.0,5.0E-7, ] linearFactor = [ 2,1,1, ] [[[1.0E-7], [0.0]], [[0.0], [2.0]], [[0.0], [5.0E-7]]] [[[1.0E-7], [0.0]], [[0.0], [2.0]], [[0.0], [5.0E-7]]] [[[1.0E-7], [0.0]], [[0.0], [2.0]], [[0.0], [5.0E-7]]] [[[1.0], [0.0]], [[0.0], [2.0]], [[0.0], [5.0]]] 10000 call to convertStringToList time: 0.035 10000 call to convertStringToList2 time: 0.031 dummy: 60000 Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.099 sec - in org.nuiton.math.matrix.MatrixNDDoubleBigMappedVectorTest Running org.nuiton.math.matrix.MatrixNDFloatVectorTest [[[1.0000000116860974E-7], [0.0]], [[0.0], [2.0]], [[0.0], [4.999999987376214E-7]]] dimensions = [ 3,2,1, ] matrice = [ 1.0000000116860974E-7,0.0,0.0,2.0,0.0,4.999999987376214E-7, ] linearFactor = [ 2,1,1, ] dimensions = [ 3,2,1, ] matrice = [ 1.0000000116860974E-7,0.0,0.0,2.0,0.0,4.999999987376214E-7, ] linearFactor = [ 2,1,1, ] [[[1.0000000116860974E-7], [0.0]], [[0.0], [2.0]], [[0.0], [4.999999987376214E-7]]] [[[1.0000000116860974E-7], [0.0]], [[0.0], [2.0]], [[0.0], [4.999999987376214E-7]]] [[[1.0000000116860974E-7], [0.0]], [[0.0], [2.0]], [[0.0], [4.999999987376214E-7]]] [[[1.0000000116860974], [0.0]], [[0.0], [2.0]], [[0.0], [4.999999987376214]]] 10000 call to convertStringToList time: 0.063 10000 call to convertStringToList2 time: 0.054 dummy: 60000 Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.135 sec - in org.nuiton.math.matrix.MatrixNDFloatVectorTest Running org.nuiton.math.matrix.SubMatrixFloatBigVectorTest mat:Ma mat matrix2D [ 4.0,4.0,4.0,4.0, 4.0,4.0,4.0,4.0, 4.0,4.0,4.0,4.0, 4.0,4.0,4.0,4.0,] smat1:dimensions = [ 4,2, ] matrice = [ 4.0,4.0,4.0,4.0,4.0,4.0,4.0,4.0, ] smat2:dimensions = [ 1,2, ] matrice = [ 4.0,4.0, ] mat:Ma mat matrix2D [ 4.0,4.0,16.0,4.0, 4.0,4.0,16.0,4.0, 4.0,4.0,4.0,4.0, 4.0,4.0,4.0,4.0,] smat1:dimensions = [ 4,2, ] matrice = [ 4.0,4.0,4.0,4.0,16.0,16.0,4.0,4.0, ] smat2:dimensions = [ 1,2, ] matrice = [ 16.0,16.0, ] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in org.nuiton.math.matrix.SubMatrixFloatBigVectorTest Running org.nuiton.math.matrix.PerfDoubleVectorTest Perf DoubleVector(1000000) Iterator init: 0.000 fill: 0.104 memory: 43.048Mo/228Mo Perf DoubleVector(1000000) Semantic init: 0.000 fill: 0.172 memory: 34.144Mo/239Mo Perf DoubleVector(1000000) Index init: 0.000 fill: 0.097 memory: 43.092Mo/288Mo Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.411 sec - in org.nuiton.math.matrix.PerfDoubleVectorTest Running org.nuiton.math.matrix.BasicMatrixFloatVectorTest testPerfLineaire: 0.000 testPerfCoordonnee2: 0.068 testPerfCoordonnee2 re: 0.063 testPerfLineaire2: 0.005 testPerfCoordonnee4: 0.034 testPerfCoordonnee4 re: 0.032 testPerfLineaire4: 0.000 testPerfCoordonnee iter: 0.135 testPerfCoordonnee iter: 0.121 testPerfLineaire map: 0.002 Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.47 sec - in org.nuiton.math.matrix.BasicMatrixFloatVectorTest Running org.nuiton.math.matrix.SubMatrixDoubleBigMappedVectorTest mat:Ma mat matrix2D [ 4.0,4.0,4.0,4.0, 4.0,4.0,4.0,4.0, 4.0,4.0,4.0,4.0, 4.0,4.0,4.0,4.0,] smat1:dimensions = [ 4,2, ] matrice = [ 4.0,4.0,4.0,4.0,4.0,4.0,4.0,4.0, ] smat2:dimensions = [ 1,2, ] matrice = [ 4.0,4.0, ] mat:Ma mat matrix2D [ 4.0,4.0,16.0,4.0, 4.0,4.0,16.0,4.0, 4.0,4.0,4.0,4.0, 4.0,4.0,4.0,4.0,] smat1:dimensions = [ 4,2, ] matrice = [ 4.0,4.0,4.0,4.0,16.0,16.0,4.0,4.0, ] smat2:dimensions = [ 1,2, ] matrice = [ 16.0,16.0, ] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec - in org.nuiton.math.matrix.SubMatrixDoubleBigMappedVectorTest Running org.nuiton.math.matrix.FloatVectorTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in org.nuiton.math.matrix.FloatVectorTest Results : Tests run: 276, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ nuiton-matrix --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/nuiton-matrix-ci/ws/trunk/nuiton-matrix/ta…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ nuiton-matrix --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building NuitonMatrix :: Nuiton-matrix-gui 2.4-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/jaxx/jaxx-maven-plugin/2.8.2… [WARNING] The POM for org.nuiton.jaxx:jaxx-maven-plugin:jar:2.8.2 is missing, no dependency information available [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/jaxx/jaxx-maven-plugin/2.8.2… [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Nuiton Matrix ..................................... SUCCESS [ 2.437 s] [INFO] NuitonMatrix :: Nuiton-matrix ..................... SUCCESS [ 13.278 s] [INFO] NuitonMatrix :: Nuiton-matrix-gui ................. FAILURE [ 2.586 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 19.404 s [INFO] Finished at: 2014-03-17T16:47:42+01:00 [INFO] Final Memory: 34M/433M [INFO] ------------------------------------------------------------------------ [ERROR] Plugin org.nuiton.jaxx:jaxx-maven-plugin:2.8.2 or one of its dependencies could not be resolved: Could not find artifact org.nuiton.jaxx:jaxx-maven-plugin:jar:2.8.2 in releases (http://nexus.nuiton.org/nexus/content/repositories/central-releases) -> [Help 1] org.apache.maven.plugin.PluginResolutionException: Plugin org.nuiton.jaxx:jaxx-maven-plugin:2.8.2 or one of its dependencies could not be resolved: Could not find artifact org.nuiton.jaxx:jaxx-maven-plugin:jar:2.8.2 in releases (http://nexus.nuiton.org/nexus/content/repositories/central-releases) at org.apache.maven.plugin.internal.DefaultPluginDependenciesResolver.resolve(DefaultPluginDependenciesResolver.java:133) at org.apache.maven.plugin.internal.DefaultMavenPluginManager.getPluginDescriptor(DefaultMavenPluginManager.java:148) at org.apache.maven.plugin.internal.DefaultMavenPluginManager.getMojoDescriptor(DefaultMavenPluginManager.java:267) at org.apache.maven.plugin.DefaultBuildPluginManager.getMojoDescriptor(DefaultBuildPluginManager.java:240) at org.apache.maven.lifecycle.internal.DefaultLifecycleMappingDelegate.calculateLifecycleMappings(DefaultLifecycleMappingDelegate.java:110) at org.apache.maven.lifecycle.internal.DefaultLifecycleExecutionPlanCalculator.calculateLifecycleMappings(DefaultLifecycleExecutionPlanCalculator.java:248) at org.apache.maven.lifecycle.internal.DefaultLifecycleExecutionPlanCalculator.calculateMojoExecutions(DefaultLifecycleExecutionPlanCalculator.java:199) at org.apache.maven.lifecycle.internal.DefaultLifecycleExecutionPlanCalculator.calculateExecutionPlan(DefaultLifecycleExecutionPlanCalculator.java:118) at org.apache.maven.lifecycle.internal.DefaultLifecycleExecutionPlanCalculator.calculateExecutionPlan(DefaultLifecycleExecutionPlanCalculator.java:135) at org.apache.maven.lifecycle.internal.builder.BuilderCommon.resolveBuildPlan(BuilderCommon.java:97) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:101) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.eclipse.aether.resolution.ArtifactResolutionException: Could not find artifact org.nuiton.jaxx:jaxx-maven-plugin:jar:2.8.2 in releases (http://nexus.nuiton.org/nexus/content/repositories/central-releases) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:459) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolveArtifacts(DefaultArtifactResolver.java:262) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolveArtifact(DefaultArtifactResolver.java:239) at org.eclipse.aether.internal.impl.DefaultRepositorySystem.resolveArtifact(DefaultRepositorySystem.java:295) at org.apache.maven.plugin.internal.DefaultPluginDependenciesResolver.resolve(DefaultPluginDependenciesResolver.java:129) ... 37 more Caused by: org.eclipse.aether.transfer.ArtifactNotFoundException: Could not find artifact org.nuiton.jaxx:jaxx-maven-plugin:jar:2.8.2 in releases (http://nexus.nuiton.org/nexus/content/repositories/central-releases) at org.eclipse.aether.connector.wagon.WagonRepositoryConnector$6.wrap(WagonRepositoryConnector.java:1012) at org.eclipse.aether.connector.wagon.WagonRepositoryConnector$6.wrap(WagonRepositoryConnector.java:1004) at org.eclipse.aether.connector.wagon.WagonRepositoryConnector$GetTask.run(WagonRepositoryConnector.java:725) at org.eclipse.aether.util.concurrency.RunnableErrorForwarder$1.run(RunnableErrorForwarder.java:67) ... 3 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/PluginResolutionException Sending e-mails to: nuiton-matrix-commits(a)list.nuiton.org channel stopped

1 2

Build failed in Jenkins: nuiton-matrix-ci » NuitonMatrix :: Nuiton-matrix-gui #5
by admin+ci-nuiton.org＠codelutin.com April 10, 2014

April 10, 2014

See <http://ci.nuiton.org/jenkins/job/nuiton-matrix-ci/org.nuiton.matrix$nuiton-…> ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building NuitonMatrix :: Nuiton-matrix-gui 2.4-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/jaxx/jaxx-maven-plugin/2.8.2… [WARNING] The POM for org.nuiton.jaxx:jaxx-maven-plugin:jar:2.8.2 is missing, no dependency information available [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/jaxx/jaxx-maven-plugin/2.8.2… [JENKINS] Archiving disabled

1 2

r471 - in trunk/nuiton-matrix/src: main/java/org/nuiton/math/matrix test/java/org/nuiton/math/matrix
by bpoussin＠users.nuiton.org April 10, 2014

April 10, 2014

Author: bpoussin Date: 2014-04-10 14:44:04 +0200 (Thu, 10 Apr 2014) New Revision: 471 Url: http://forge.nuiton.org/projects/nuiton-matrix/repository/revisions/471 Log: Add LazyVector to prevent memory allocation when not necessary Added: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigMappedVector.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleVector.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatBigVector.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatVector.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/Vector.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/PerfDoubleBigVectorTest.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigMappedVector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigMappedVector.java 2014-03-17 16:08:38 UTC (rev 470) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigMappedVector.java 2014-04-10 12:44:04 UTC (rev 471) @@ -66,6 +66,9 @@ } } + public DoubleBigMappedVector() { + } + /** * Create temp file, this file is deleted when you stop application or * when this instance is no more used. @@ -73,15 +76,26 @@ * @throws IOException */ public DoubleBigMappedVector(int capacity) throws IOException { - this.capacity = capacity; - this.file = File.createTempFile("matrix", ".mapped"); - this.file.deleteOnExit(); - RandomAccessFile raf = new RandomAccessFile(file, "rw"); - data = raf.getChannel() - .map(FileChannel.MapMode.READ_WRITE, 0, capacity * DOUBLE_SIZE) - .asDoubleBuffer(); + init(capacity); } + @Override + public void init(int capacity) { + try { + if (data == null) { + this.capacity = capacity; + this.file = File.createTempFile("matrix", ".mapped"); + this.file.deleteOnExit(); + RandomAccessFile raf = new RandomAccessFile(file, "rw"); + data = raf.getChannel() + .map(FileChannel.MapMode.READ_WRITE, 0, capacity * DOUBLE_SIZE) + .asDoubleBuffer(); + } + } catch (IOException eee) { + throw new MatrixException("Can't init vector", eee); + } + } + /** * Utilise une partie du fichier pour stocker les informations * @param raf le fichier a utiliser Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java 2014-03-17 16:08:38 UTC (rev 470) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java 2014-04-10 12:44:04 UTC (rev 471) @@ -42,11 +42,21 @@ protected double data[] = null; + public DoubleBigVector() { + } + public DoubleBigVector(int capacity) { - data = new double[capacity]; + init(capacity); } @Override + public void init(int capacity) { + if (data == null) { + data = new double[capacity]; + } + } + + @Override public int size() { return data.length; } Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleVector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleVector.java 2014-03-17 16:08:38 UTC (rev 470) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleVector.java 2014-04-10 12:44:04 UTC (rev 471) @@ -56,12 +56,14 @@ protected int positionSize = 0; /** contient la valeur de l'element */ - protected ArrayDoubleList data = new ArrayDoubleList(); + protected ArrayDoubleList data; + public DoubleVector() { + } + + public DoubleVector(int capacity) { - this.capacity = capacity; - position = new int[8]; - Arrays.fill(position, Integer.MAX_VALUE); + init(capacity); } public DoubleVector(int capacity, double defaultValue) { @@ -70,6 +72,16 @@ } @Override + public void init(int capacity) { + if (data == null) { + this.capacity = capacity; + this.data = new ArrayDoubleList(); + position = new int[8]; + Arrays.fill(position, Integer.MAX_VALUE); + } + } + + @Override public int size() { return capacity; } Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatBigVector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatBigVector.java 2014-03-17 16:08:38 UTC (rev 470) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatBigVector.java 2014-04-10 12:44:04 UTC (rev 471) @@ -42,11 +42,21 @@ protected float data[] = null; + public FloatBigVector() { + } + public FloatBigVector(int capacity) { - data = new float[capacity]; + init(capacity); } @Override + public void init(int capacity) { + if (data == null) { + data = new float[capacity]; + } + } + + @Override public int size() { return data.length; } Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatVector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatVector.java 2014-03-17 16:08:38 UTC (rev 470) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatVector.java 2014-04-10 12:44:04 UTC (rev 471) @@ -56,12 +56,13 @@ protected int positionSize = 0; /** contient la valeur de l'element */ - protected ArrayFloatList data = new ArrayFloatList(); + protected ArrayFloatList data; + public FloatVector() { + } + public FloatVector(int capacity) { - this.capacity = capacity; - position = new int[8]; - Arrays.fill(position, Integer.MAX_VALUE); + init(capacity); } public FloatVector(int capacity, float defaultValue) { @@ -70,6 +71,16 @@ } @Override + public void init(int capacity) { + if (data == null) { + this.capacity = capacity; + position = new int[8]; + data = new ArrayFloatList(); + Arrays.fill(position, Integer.MAX_VALUE); + } + } + + @Override public int size() { return capacity; } Added: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java (rev 0) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java 2014-04-10 12:44:04 UTC (rev 471) @@ -0,0 +1,168 @@ +package org.nuiton.math.matrix; + + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * + * Cette classe encapsule un Vector et permet de l'initialiser reellement que + * lorsqu'on souhaite modifier une valeur. Cela permet de ne pas initialise + * d'enorme tableau s'il n'y en a pas besoin. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class LazyVector implements Vector { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(LazyVector.class); + + protected boolean isInitBackend = false; + /** reel backend, not initialized since not necessary */ + protected Vector backend; + /** vector used when paste is called and backend is not initialized */ + protected Vector copy; + protected int capacity; + + public LazyVector(Vector backend, int capacity) { + this.backend = backend; + this.capacity = capacity; + } + + @Override + public void init(int capacity) { + } + + @Override + public double getMaxOccurence() { + return getMaxOccurrence(); + } + + @Override + public double getMaxOccurrence() { + double result = 0; + if (isInitBackend) { + result = backend.getMaxOccurrence(); + } else if (copy != null) { + result = copy.getMaxOccurrence(); + } + return result; + } + + @Override + public double getValue(int pos) { + double result = 0; + if (isInitBackend) { + result = backend.getValue(pos); + } else if (copy != null) { + result = copy.getValue(pos); + } + return result; + } + + @Override + public void setValue(int pos, double value) { + initBackend(); + backend.setValue(pos, value); + } + + @Override + public int size() { + return capacity; + } + + @Override + public boolean isImplementedPaste(Vector v) { + return true; + } + + @Override + public boolean isImplementedAdd(Vector v) { + return backend.isImplementedAdd(v); + } + + @Override + public boolean isImplementedMinus(Vector v) { + return backend.isImplementedMinus(v); + } + + @Override + public boolean isImplementedMap() { + return backend.isImplementedMap(); + } + + @Override + public void paste(Vector source) { + if (!isInitBackend && copy == null) { + copy = source; + } else { + // initialized or already has copy, we need to paste, and not just + // reassign copy variable, in case of source Vector is smaller than copy + initBackend(); + pasteToBackend(source); + } + } + + @Override + public void add(Vector v) { + initBackend(); + backend.add(v); + } + + @Override + public void minus(Vector v) { + initBackend(); + backend.minus(v); + } + + @Override + public void map(MapFunction f) { + initBackend(); + backend.map(f); + } + + @Override + public boolean equals(Object o) { + boolean result = false; + if (o instanceof Vector) { + Vector v = (Vector)o; + if (size() == v.size()) { + if (isInitBackend) { + result = v.equals(backend); + } else if (copy != null) { + result = v.equals(copy); + } else if (v instanceof LazyVector && !((LazyVector)v).isInitBackend && ((LazyVector)v).copy == null) { + result = true; + } else { + result = v.equals(this); + } + } + } + return result; + } + + protected void initBackend() { + if (!isInitBackend) { + backend.init(capacity); + if (copy != null) { + pasteToBackend(copy); + } + isInitBackend = true; + } + } + + protected void pasteToBackend(Vector copy) { + if (backend.isImplementedPaste(copy)) { + backend.paste(copy); + } else { + for (int i=0, max=Math.min(size(), copy.size()); i<max; i++) { + double v = copy.getValue(i); + backend.setValue(i, v); + } + } + } +} Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/LazyVector.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2014-03-17 16:08:38 UTC (rev 470) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2014-04-10 12:44:04 UTC (rev 471) @@ -43,6 +43,13 @@ */ public class MatrixFactory { // MatrixFactory + /** + * If true, createVector return all time LazyVector to prevent memory + * allocation when not necessary. LazyVector init real vector only when + * necessary + */ + protected static boolean useLazyVector = true; + /** Valeur par defaut si aucun type de Vector n'est donné */ protected static Class<?> defaultVectorClass = DoubleBigVector.class; @@ -235,9 +242,12 @@ protected Vector createVector(int length) { try { - Constructor<?> c = vectorClass - .getConstructor(new Class<?>[] { Integer.TYPE }); - return (Vector) c.newInstance(new Object[] { length }); + Vector result = (Vector)vectorClass.newInstance(); + if (useLazyVector) { + result = new LazyVector(result, length); + } + result.init(length); + return result; } catch (Exception eee) { throw new RuntimeException("Can't create vector", eee); } Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/Vector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/Vector.java 2014-03-17 16:08:38 UTC (rev 470) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/Vector.java 2014-04-10 12:44:04 UTC (rev 471) @@ -39,11 +39,24 @@ public interface Vector { // Vector /** + * Init vector, before this method call, vector is in indetermined state. + * multiple call to init method must be permit. Only first call must do + * some work, extra call must do nothing + * + * @param capacity + */ + public void init(int capacity); + + /** * @deprecated since 2.1, use {@link #getMaxOccurrence()} instead */ @Deprecated public double getMaxOccurence(); - + + /** + * Retourne la valeur la plus utilise dans le vector + * @return + */ public double getMaxOccurrence(); public double getValue(int pos); Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/PerfDoubleBigVectorTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/PerfDoubleBigVectorTest.java 2014-03-17 16:08:38 UTC (rev 470) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/PerfDoubleBigVectorTest.java 2014-04-10 12:44:04 UTC (rev 471) @@ -137,6 +137,52 @@ } @Test + public void testDoubleVectorMap() throws Exception { + List<String> sem = getSem(); + + // [ 2600 x 2600 x 2600 ] + System.gc(); // force gc now to minimize gc call during timing + long timestart = System.nanoTime(); + MatrixND mat = MatrixFactory.getInstance(getVectorClass()).create("Ma mat", + new List[] { sem, sem, sem }); + + long cpt = 1; + for (MatrixIterator i = mat.iterator(); i.hasNext();) { + i.next(); + i.setValue(cpt++); + } + + long timeinit = System.nanoTime(); + + // application de la fonction + mat.map(new MapFunction() { + long cpt = 1; + public double apply(double value) { + return cpt++; + } + }); + + long timeend = System.nanoTime(); + + long freeMem = Runtime.getRuntime().freeMemory(); + long totalMem = Runtime.getRuntime().totalMemory(); + + long vectorSize = ((MatrixNDImpl)mat).getInternalMatrix().getInternalVector().size(); + + System.out.println( + "Perf " + getVectorClass().getSimpleName() + "(" + + vectorSize + ")" + + "\tMap func\tinit: " + + DurationFormatUtils.formatDuration( + (timeinit - timestart) / 1000000, "s'.'S") + + " fill: " + + DurationFormatUtils.formatDuration( + (timeend - timeinit) / 1000000, "s'.'S") + + " memory: " + StringUtil.convertMemory(totalMem - freeMem) + "/" + + StringUtil.convertMemory(totalMem)); + } + + @Test public void testDoubleVectorSemantic() throws Exception { List<String> sem = getSem(); int size = sem.size();

1 0

[ANN] - Nuiton Matrix 2.3.3 released
by nuiton.org Release Notification March 17, 2014

March 17, 2014

The Nuiton Matrix team is pleased to announce the matrix-2.3.3 release! Multiple dimensions matrix library Documentation of the project can be found here: http://maven-site.nuiton.org/nuiton-matrix Changes ------- Changes in this version include: Changes: o Updates commons-lang3 to 3.2.1 Issue: 3092. Thanks to Tony Chemit. Resolved by tchemit. o Updates jaxx to 2.8.2 Issue: 3091. Thanks to Tony Chemit. Resolved by tchemit. o updates nuiton-utils to 3.0-rc-2 Issue: 3090. Thanks to Tony Chemit. Resolved by tchemit. o Updates i18n to 3.0 Issue: 3089. Thanks to Tony Chemit. Resolved by tchemit. o Updates to mavenpom 5.0 Issue: 3088. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton|matrix|2.3.3|jar Have fun! -Nuiton Matrix team

1 0

r470 - in trunk: . nuiton-matrix nuiton-matrix-gui
by tchemit＠users.nuiton.org March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 17:08:38 +0100 (Mon, 17 Mar 2014) New Revision: 470 Url: http://forge.nuiton.org/projects/nuiton-matrix/repository/revisions/470 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix/pom.xml trunk/pom.xml Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2014-03-17 16:08:32 UTC (rev 469) +++ trunk/nuiton-matrix/pom.xml 2014-03-17 16:08:38 UTC (rev 470) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2014-03-17 16:08:32 UTC (rev 469) +++ trunk/nuiton-matrix-gui/pom.xml 2014-03-17 16:08:38 UTC (rev 470) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-17 16:08:32 UTC (rev 469) +++ trunk/pom.xml 2014-03-17 16:08:38 UTC (rev 470) @@ -9,7 +9,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.3.3</version> + <version>2.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Nuiton Matrix</name> @@ -24,12 +24,12 @@ <scm> <connection> - scm:svn:https://nuiton.org/svn/nuiton-matrix/tags/nuiton-matrix-2.3.3 + scm:svn:https://nuiton.org/svn/nuiton-matrix/trunk </connection> <developerConnection> - scm:svn:https://nuiton.org/svn/nuiton-matrix/tags/nuiton-matrix-2.3.3 + scm:svn:https://nuiton.org/svn/nuiton-matrix/trunk </developerConnection> - <url>https://www.nuiton.org/projects/nuiton-matrix/repository/show/tags/nuiton-m…</url> + <url>https://www.nuiton.org/projects/nuiton-matrix/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r469 - in tags: . nuiton-matrix-2.3.3
by tchemit＠users.nuiton.org March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 17:08:32 +0100 (Mon, 17 Mar 2014) New Revision: 469 Url: http://forge.nuiton.org/projects/nuiton-matrix/repository/revisions/469 Log: [maven-release-plugin] copy for tag nuiton-matrix-2.3.3 Added: tags/nuiton-matrix-2.3.3/ Property changes on: tags/nuiton-matrix-2.3.3 ___________________________________________________________________ Added: svn:ignore + target .settings .classpath .project *.ipr *.iml bin Added: svn:mergeinfo +

1 0

r468 - in trunk: . nuiton-matrix nuiton-matrix-gui
by tchemit＠users.nuiton.org March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 17:08:27 +0100 (Mon, 17 Mar 2014) New Revision: 468 Url: http://forge.nuiton.org/projects/nuiton-matrix/repository/revisions/468 Log: [maven-release-plugin] prepare release nuiton-matrix-2.3.3 Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix/pom.xml trunk/pom.xml Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2014-03-17 15:44:42 UTC (rev 467) +++ trunk/nuiton-matrix/pom.xml 2014-03-17 16:08:27 UTC (rev 468) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3.3</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2014-03-17 15:44:42 UTC (rev 467) +++ trunk/nuiton-matrix-gui/pom.xml 2014-03-17 16:08:27 UTC (rev 468) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3.3</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-17 15:44:42 UTC (rev 467) +++ trunk/pom.xml 2014-03-17 16:08:27 UTC (rev 468) @@ -9,7 +9,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3.3</version> <packaging>pom</packaging> <name>Nuiton Matrix</name> @@ -24,12 +24,12 @@ <scm> <connection> - scm:svn:https://nuiton.org/svn/nuiton-matrix/trunk + scm:svn:https://nuiton.org/svn/nuiton-matrix/tags/nuiton-matrix-2.3.3 </connection> <developerConnection> - scm:svn:https://nuiton.org/svn/nuiton-matrix/trunk + scm:svn:https://nuiton.org/svn/nuiton-matrix/tags/nuiton-matrix-2.3.3 </developerConnection> - <url>https://www.nuiton.org/projects/nuiton-matrix/repository/show/trunk</url> + <url>https://www.nuiton.org/projects/nuiton-matrix/repository/show/tags/nuiton-m…</url> </scm> <distributionManagement> <site>

1 0