IGNITE-5000 Rename Ignite Math module to Ignite ML module added missed licenses renamed packages fixed wrong ml profile activation (cherry picked from commit d78e071)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0abf6601 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0abf6601 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0abf6601 Branch: refs/heads/ignite-5075 Commit: 0abf6601fc1ff1e6e659381666ae706e31b51de0 Parents: 5d8e318 Author: Yury Babak <yba...@gridgain.com> Authored: Tue Apr 18 16:47:15 2017 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Tue Apr 18 17:54:20 2017 +0300 ---------------------------------------------------------------------- examples/pom-standalone-lgpl.xml | 4 - examples/pom-standalone.xml | 4 - examples/pom.xml | 4 - .../CholeskyDecompositionExample.java | 8 +- .../EigenDecompositionExample.java | 8 +- .../decompositions/LUDecompositionExample.java | 8 +- .../SingularValueDecompositionExample.java | 6 +- .../ml/math/matrix/CacheMatrixExample.java | 10 +- .../ml/math/matrix/ExampleMatrixStorage.java | 4 +- .../math/matrix/MatrixCustomStorageExample.java | 12 +- .../examples/ml/math/matrix/MatrixExample.java | 4 +- .../ml/math/matrix/MatrixExampleUtil.java | 4 +- .../ml/math/matrix/OffHeapMatrixExample.java | 4 +- .../matrix/SparseDistributedMatrixExample.java | 5 +- .../ml/math/matrix/SparseMatrixExample.java | 4 +- .../examples/ml/math/tracer/TracerExample.java | 4 +- .../ml/math/vector/CacheVectorExample.java | 8 +- .../ml/math/vector/ExampleVectorStorage.java | 4 +- .../ml/math/vector/OffHeapVectorExample.java | 4 +- .../ml/math/vector/SparseVectorExample.java | 6 +- .../math/vector/VectorCustomStorageExample.java | 14 +- .../examples/ml/math/vector/VectorExample.java | 4 +- modules/ml/pom.xml | 6 - .../java/org/apache/ignite/math/Algebra.java | 571 --------- .../java/org/apache/ignite/math/Constants.java | 42 - .../org/apache/ignite/math/Destroyable.java | 30 - .../apache/ignite/math/IdentityValueMapper.java | 53 - .../java/org/apache/ignite/math/KeyMapper.java | 33 - .../java/org/apache/ignite/math/Matrix.java | 518 -------- .../org/apache/ignite/math/MatrixKeyMapper.java | 30 - .../org/apache/ignite/math/MatrixStorage.java | 58 - .../org/apache/ignite/math/MetaAttributes.java | 76 -- .../java/org/apache/ignite/math/MurmurHash.java | 246 ---- .../apache/ignite/math/StorageConstants.java | 49 - .../apache/ignite/math/StorageOpsMetrics.java | 49 - .../java/org/apache/ignite/math/Tracer.java | 456 ------- .../org/apache/ignite/math/ValueMapper.java | 27 - .../java/org/apache/ignite/math/Vector.java | 498 -------- .../org/apache/ignite/math/VectorKeyMapper.java | 29 - .../org/apache/ignite/math/VectorStorage.java | 53 - .../decompositions/CholeskyDecomposition.java | 306 ----- .../decompositions/DecompositionSupport.java | 105 -- .../math/decompositions/EigenDecomposition.java | 923 --------------- .../math/decompositions/LUDecomposition.java | 366 ------ .../math/decompositions/QRDecomposition.java | 186 --- .../SingularValueDecomposition.java | 620 ---------- .../math/decompositions/package-info.java | 22 - .../math/exceptions/CardinalityException.java | 38 - .../math/exceptions/ColumnIndexException.java | 35 - .../ignite/math/exceptions/IndexException.java | 35 - .../NonPositiveDefiniteMatrixException.java | 20 - .../exceptions/NonSymmetricMatrixException.java | 18 - .../math/exceptions/RowIndexException.java | 35 - .../exceptions/SingularMatrixException.java | 30 - .../exceptions/UnknownProviderException.java | 35 - .../UnsupportedOperationException.java | 44 - .../ignite/math/exceptions/package-info.java | 22 - .../apache/ignite/math/functions/Functions.java | 136 --- .../ignite/math/functions/IgniteBiConsumer.java | 12 - .../ignite/math/functions/IgniteBiFunction.java | 29 - .../ignite/math/functions/IgniteConsumer.java | 29 - .../math/functions/IgniteDoubleFunction.java | 29 - .../ignite/math/functions/IgniteFunction.java | 30 - .../math/functions/IntDoubleToVoidFunction.java | 25 - .../functions/IntIntDoubleToVoidFunction.java | 28 - .../math/functions/IntIntToDoubleFunction.java | 24 - .../ignite/math/functions/package-info.java | 22 - .../apache/ignite/math/impls/CacheUtils.java | 356 ------ .../math/impls/matrix/AbstractMatrix.java | 880 -------------- .../ignite/math/impls/matrix/CacheMatrix.java | 158 --- .../impls/matrix/DenseLocalOffHeapMatrix.java | 90 -- .../impls/matrix/DenseLocalOnHeapMatrix.java | 86 -- .../math/impls/matrix/DiagonalMatrix.java | 101 -- .../math/impls/matrix/FunctionMatrix.java | 95 -- .../ignite/math/impls/matrix/MatrixView.java | 84 -- .../math/impls/matrix/PivotedMatrixView.java | 243 ---- .../ignite/math/impls/matrix/RandomMatrix.java | 97 -- .../impls/matrix/SparseDistributedMatrix.java | 155 --- .../impls/matrix/SparseLocalOnHeapMatrix.java | 72 -- .../math/impls/matrix/TransposedMatrixView.java | 84 -- .../ignite/math/impls/matrix/package-info.java | 22 - .../apache/ignite/math/impls/package-info.java | 22 - .../storage/matrix/ArrayMatrixStorage.java | 161 --- .../storage/matrix/CacheMatrixStorage.java | 180 --- .../matrix/DenseOffHeapMatrixStorage.java | 197 ---- .../storage/matrix/DiagonalMatrixStorage.java | 136 --- .../storage/matrix/FunctionMatrixStorage.java | 175 --- .../storage/matrix/MatrixDelegateStorage.java | 205 ---- .../storage/matrix/PivotedMatrixStorage.java | 256 ---- .../storage/matrix/RandomMatrixStorage.java | 176 --- .../matrix/SparseDistributedMatrixStorage.java | 281 ----- .../matrix/SparseLocalOnHeapMatrixStorage.java | 226 ---- .../math/impls/storage/matrix/package-info.java | 22 - .../storage/vector/ArrayVectorStorage.java | 135 --- .../storage/vector/CacheVectorStorage.java | 175 --- .../storage/vector/ConstantVectorStorage.java | 133 --- .../storage/vector/DelegateVectorStorage.java | 157 --- .../vector/DenseLocalOffHeapVectorStorage.java | 172 --- .../storage/vector/FunctionVectorStorage.java | 141 --- .../storage/vector/MatrixVectorStorage.java | 185 --- .../storage/vector/PivotedVectorStorage.java | 175 --- .../storage/vector/RandomVectorStorage.java | 152 --- .../SingleElementVectorDelegateStorage.java | 145 --- .../vector/SingleElementVectorStorage.java | 143 --- .../vector/SparseLocalOffHeapVectorStorage.java | 148 --- .../vector/SparseLocalOnHeapVectorStorage.java | 152 --- .../math/impls/storage/vector/package-info.java | 22 - .../impls/vector/AbstractReadOnlyVector.java | 108 -- .../math/impls/vector/AbstractVector.java | 903 -------------- .../ignite/math/impls/vector/CacheVector.java | 140 --- .../math/impls/vector/ConstantVector.java | 84 -- .../math/impls/vector/DelegatingVector.java | 391 ------ .../impls/vector/DenseLocalOffHeapVector.java | 89 -- .../impls/vector/DenseLocalOnHeapVector.java | 104 -- .../math/impls/vector/FunctionVector.java | 112 -- .../math/impls/vector/MatrixVectorView.java | 139 --- .../math/impls/vector/PivotedVectorView.java | 163 --- .../ignite/math/impls/vector/RandomVector.java | 128 -- .../math/impls/vector/SingleElementVector.java | 102 -- .../impls/vector/SingleElementVectorView.java | 97 -- .../impls/vector/SparseLocalOffHeapVector.java | 47 - .../math/impls/vector/SparseLocalVector.java | 71 -- .../ignite/math/impls/vector/VectorView.java | 85 -- .../ignite/math/impls/vector/package-info.java | 22 - .../org/apache/ignite/math/package-info.java | 22 - .../java/org/apache/ignite/ml/math/Algebra.java | 571 +++++++++ .../org/apache/ignite/ml/math/Constants.java | 42 + .../org/apache/ignite/ml/math/Destroyable.java | 30 + .../ignite/ml/math/IdentityValueMapper.java | 53 + .../org/apache/ignite/ml/math/KeyMapper.java | 33 + .../java/org/apache/ignite/ml/math/Matrix.java | 518 ++++++++ .../apache/ignite/ml/math/MatrixKeyMapper.java | 30 + .../apache/ignite/ml/math/MatrixStorage.java | 58 + .../apache/ignite/ml/math/MetaAttributes.java | 76 ++ .../org/apache/ignite/ml/math/MurmurHash.java | 246 ++++ .../apache/ignite/ml/math/StorageConstants.java | 49 + .../ignite/ml/math/StorageOpsMetrics.java | 49 + .../java/org/apache/ignite/ml/math/Tracer.java | 456 +++++++ .../org/apache/ignite/ml/math/ValueMapper.java | 35 + .../java/org/apache/ignite/ml/math/Vector.java | 498 ++++++++ .../apache/ignite/ml/math/VectorKeyMapper.java | 29 + .../apache/ignite/ml/math/VectorStorage.java | 53 + .../decompositions/CholeskyDecomposition.java | 306 +++++ .../decompositions/DecompositionSupport.java | 105 ++ .../math/decompositions/EigenDecomposition.java | 923 +++++++++++++++ .../ml/math/decompositions/LUDecomposition.java | 366 ++++++ .../ml/math/decompositions/QRDecomposition.java | 186 +++ .../SingularValueDecomposition.java | 620 ++++++++++ .../ml/math/decompositions/package-info.java | 22 + .../math/exceptions/CardinalityException.java | 38 + .../math/exceptions/ColumnIndexException.java | 35 + .../ml/math/exceptions/IndexException.java | 35 + .../NonPositiveDefiniteMatrixException.java | 37 + .../exceptions/NonSymmetricMatrixException.java | 35 + .../ml/math/exceptions/RowIndexException.java | 35 + .../exceptions/SingularMatrixException.java | 30 + .../exceptions/UnknownProviderException.java | 35 + .../UnsupportedOperationException.java | 44 + .../ignite/ml/math/exceptions/package-info.java | 22 + .../ignite/ml/math/functions/Functions.java | 136 +++ .../ml/math/functions/IgniteBiConsumer.java | 29 + .../ml/math/functions/IgniteBiFunction.java | 29 + .../ml/math/functions/IgniteConsumer.java | 29 + .../ml/math/functions/IgniteDoubleFunction.java | 29 + .../ml/math/functions/IgniteFunction.java | 30 + .../math/functions/IntDoubleToVoidFunction.java | 25 + .../functions/IntIntDoubleToVoidFunction.java | 28 + .../math/functions/IntIntToDoubleFunction.java | 24 + .../ignite/ml/math/functions/package-info.java | 22 + .../apache/ignite/ml/math/impls/CacheUtils.java | 356 ++++++ .../ml/math/impls/matrix/AbstractMatrix.java | 880 ++++++++++++++ .../ml/math/impls/matrix/CacheMatrix.java | 158 +++ .../impls/matrix/DenseLocalOffHeapMatrix.java | 90 ++ .../impls/matrix/DenseLocalOnHeapMatrix.java | 86 ++ .../ml/math/impls/matrix/DiagonalMatrix.java | 101 ++ .../ml/math/impls/matrix/FunctionMatrix.java | 95 ++ .../ignite/ml/math/impls/matrix/MatrixView.java | 84 ++ .../ml/math/impls/matrix/PivotedMatrixView.java | 243 ++++ .../ml/math/impls/matrix/RandomMatrix.java | 97 ++ .../impls/matrix/SparseDistributedMatrix.java | 155 +++ .../impls/matrix/SparseLocalOnHeapMatrix.java | 72 ++ .../math/impls/matrix/TransposedMatrixView.java | 84 ++ .../ml/math/impls/matrix/package-info.java | 22 + .../ignite/ml/math/impls/package-info.java | 22 + .../storage/matrix/ArrayMatrixStorage.java | 161 +++ .../storage/matrix/CacheMatrixStorage.java | 180 +++ .../matrix/DenseOffHeapMatrixStorage.java | 197 ++++ .../storage/matrix/DiagonalMatrixStorage.java | 136 +++ .../storage/matrix/FunctionMatrixStorage.java | 175 +++ .../storage/matrix/MatrixDelegateStorage.java | 205 ++++ .../storage/matrix/PivotedMatrixStorage.java | 256 ++++ .../storage/matrix/RandomMatrixStorage.java | 176 +++ .../matrix/SparseDistributedMatrixStorage.java | 290 +++++ .../matrix/SparseLocalOnHeapMatrixStorage.java | 226 ++++ .../math/impls/storage/matrix/package-info.java | 22 + .../storage/vector/ArrayVectorStorage.java | 135 +++ .../storage/vector/CacheVectorStorage.java | 175 +++ .../storage/vector/ConstantVectorStorage.java | 133 +++ .../storage/vector/DelegateVectorStorage.java | 157 +++ .../vector/DenseLocalOffHeapVectorStorage.java | 172 +++ .../storage/vector/FunctionVectorStorage.java | 141 +++ .../storage/vector/MatrixVectorStorage.java | 185 +++ .../storage/vector/PivotedVectorStorage.java | 175 +++ .../storage/vector/RandomVectorStorage.java | 152 +++ .../SingleElementVectorDelegateStorage.java | 145 +++ .../vector/SingleElementVectorStorage.java | 143 +++ .../vector/SparseLocalOffHeapVectorStorage.java | 149 +++ .../vector/SparseLocalOnHeapVectorStorage.java | 152 +++ .../math/impls/storage/vector/package-info.java | 22 + .../impls/vector/AbstractReadOnlyVector.java | 125 ++ .../ml/math/impls/vector/AbstractVector.java | 903 ++++++++++++++ .../ml/math/impls/vector/CacheVector.java | 140 +++ .../ml/math/impls/vector/ConstantVector.java | 84 ++ .../ml/math/impls/vector/DelegatingVector.java | 391 ++++++ .../impls/vector/DenseLocalOffHeapVector.java | 89 ++ .../impls/vector/DenseLocalOnHeapVector.java | 104 ++ .../ml/math/impls/vector/FunctionVector.java | 112 ++ .../ml/math/impls/vector/MatrixVectorView.java | 139 +++ .../ml/math/impls/vector/PivotedVectorView.java | 163 +++ .../ml/math/impls/vector/RandomVector.java | 129 ++ .../math/impls/vector/SingleElementVector.java | 102 ++ .../impls/vector/SingleElementVectorView.java | 97 ++ .../impls/vector/SparseLocalOffHeapVector.java | 47 + .../ml/math/impls/vector/SparseLocalVector.java | 71 ++ .../ignite/ml/math/impls/vector/VectorView.java | 85 ++ .../ml/math/impls/vector/package-info.java | 22 + .../org/apache/ignite/ml/math/package-info.java | 22 + .../apache/ignite/math/d3-matrix-template.html | 128 -- .../apache/ignite/math/d3-vector-template.html | 111 -- .../ignite/ml/math/d3-matrix-template.html | 128 ++ .../ignite/ml/math/d3-vector-template.html | 111 ++ .../org/apache/ignite/math/ExternalizeTest.java | 66 -- .../math/MathImplDistributedTestSuite.java | 39 - .../ignite/math/MathImplLocalTestSuite.java | 123 -- .../ignite/math/MathImplMainTestSuite.java | 33 - .../java/org/apache/ignite/math/TracerTest.java | 195 --- .../ignite/math/benchmark/MathBenchmark.java | 205 ---- .../math/benchmark/MathBenchmarkSelfTest.java | 100 -- .../ignite/math/benchmark/ResultsWriter.java | 127 -- .../math/benchmark/VectorBenchmarkTest.java | 138 --- .../ignite/math/benchmark/package-info.java | 18 - .../CholeskyDecompositionTest.java | 158 --- .../decompositions/EigenDecompositionTest.java | 193 --- .../decompositions/LUDecompositionTest.java | 250 ---- .../decompositions/QRDecompositionTest.java | 139 --- .../SingularValueDecompositionTest.java | 120 -- .../ignite/math/impls/MathTestConstants.java | 88 -- .../math/impls/matrix/CacheMatrixTest.java | 369 ------ .../DenseLocalOffHeapMatrixConstructorTest.java | 65 - .../DenseLocalOnHeapMatrixConstructorTest.java | 71 -- .../math/impls/matrix/DiagonalMatrixTest.java | 209 ---- .../matrix/FunctionMatrixConstructorTest.java | 113 -- .../math/impls/matrix/MatrixAttributeTest.java | 156 --- .../matrix/MatrixImplementationFixtures.java | 381 ------ .../impls/matrix/MatrixImplementationsTest.java | 1113 ------------------ .../impls/matrix/MatrixKeyMapperForTests.java | 69 -- .../impls/matrix/MatrixViewConstructorTest.java | 114 -- .../PivotedMatrixViewConstructorTest.java | 128 -- .../matrix/RandomMatrixConstructorTest.java | 71 -- .../matrix/SparseDistributedMatrixTest.java | 265 ----- .../SparseLocalOnHeapMatrixConstructorTest.java | 53 - .../impls/matrix/TransposedMatrixViewTest.java | 87 -- .../storage/matrix/MatrixArrayStorageTest.java | 63 - .../storage/matrix/MatrixBaseStorageTest.java | 89 -- .../matrix/MatrixOffHeapStorageTest.java | 39 - .../storage/matrix/MatrixStorageFixtures.java | 141 --- .../matrix/MatrixStorageImplementationTest.java | 73 -- .../SparseDistributedMatrixStorageTest.java | 126 -- .../RandomAccessSparseVectorStorageTest.java | 60 - .../SparseLocalOffHeapVectorStorageTest.java | 78 -- .../storage/vector/VectorArrayStorageTest.java | 58 - .../storage/vector/VectorBaseStorageTest.java | 69 -- .../vector/VectorOffheapStorageTest.java | 73 -- .../math/impls/vector/AbstractVectorTest.java | 543 --------- .../math/impls/vector/CacheVectorTest.java | 417 ------- .../vector/ConstantVectorConstructorTest.java | 52 - .../vector/DelegatingVectorConstructorTest.java | 62 - .../DenseLocalOffHeapVectorConstructorTest.java | 59 - .../DenseLocalOnHeapVectorConstructorTest.java | 163 --- .../vector/FunctionVectorConstructorTest.java | 121 -- .../math/impls/vector/MatrixVectorViewTest.java | 209 ---- .../PivotedVectorViewConstructorTest.java | 211 ---- .../vector/RandomVectorConstructorTest.java | 145 --- .../SingleElementVectorConstructorTest.java | 159 --- .../SingleElementVectorViewConstructorTest.java | 137 --- .../SparseLocalVectorConstructorTest.java | 54 - .../math/impls/vector/VectorAttributesTest.java | 217 ---- .../math/impls/vector/VectorFoldMapTest.java | 122 -- .../vector/VectorImplementationsFixtures.java | 655 ----------- .../impls/vector/VectorImplementationsTest.java | 860 -------------- .../math/impls/vector/VectorIterableTest.java | 376 ------ .../math/impls/vector/VectorNormTest.java | 247 ---- .../math/impls/vector/VectorToMatrixTest.java | 291 ----- .../math/impls/vector/VectorViewTest.java | 162 --- .../apache/ignite/ml/math/ExternalizeTest.java | 66 ++ .../ml/math/MathImplDistributedTestSuite.java | 39 + .../ignite/ml/math/MathImplLocalTestSuite.java | 123 ++ .../ignite/ml/math/MathImplMainTestSuite.java | 33 + .../org/apache/ignite/ml/math/TracerTest.java | 195 +++ .../ignite/ml/math/benchmark/MathBenchmark.java | 205 ++++ .../math/benchmark/MathBenchmarkSelfTest.java | 100 ++ .../ignite/ml/math/benchmark/ResultsWriter.java | 127 ++ .../ml/math/benchmark/VectorBenchmarkTest.java | 138 +++ .../ignite/ml/math/benchmark/package-info.java | 18 + .../CholeskyDecompositionTest.java | 158 +++ .../decompositions/EigenDecompositionTest.java | 193 +++ .../decompositions/LUDecompositionTest.java | 250 ++++ .../decompositions/QRDecompositionTest.java | 139 +++ .../SingularValueDecompositionTest.java | 120 ++ .../ignite/ml/math/impls/MathTestConstants.java | 88 ++ .../ml/math/impls/matrix/CacheMatrixTest.java | 369 ++++++ .../DenseLocalOffHeapMatrixConstructorTest.java | 65 + .../DenseLocalOnHeapMatrixConstructorTest.java | 71 ++ .../math/impls/matrix/DiagonalMatrixTest.java | 209 ++++ .../matrix/FunctionMatrixConstructorTest.java | 113 ++ .../math/impls/matrix/MatrixAttributeTest.java | 156 +++ .../matrix/MatrixImplementationFixtures.java | 381 ++++++ .../impls/matrix/MatrixImplementationsTest.java | 1113 ++++++++++++++++++ .../impls/matrix/MatrixKeyMapperForTests.java | 69 ++ .../impls/matrix/MatrixViewConstructorTest.java | 114 ++ .../PivotedMatrixViewConstructorTest.java | 129 ++ .../matrix/RandomMatrixConstructorTest.java | 71 ++ .../matrix/SparseDistributedMatrixTest.java | 265 +++++ .../SparseLocalOnHeapMatrixConstructorTest.java | 53 + .../impls/matrix/TransposedMatrixViewTest.java | 87 ++ .../storage/matrix/MatrixArrayStorageTest.java | 63 + .../storage/matrix/MatrixBaseStorageTest.java | 89 ++ .../matrix/MatrixOffHeapStorageTest.java | 39 + .../storage/matrix/MatrixStorageFixtures.java | 137 +++ .../matrix/MatrixStorageImplementationTest.java | 73 ++ .../SparseDistributedMatrixStorageTest.java | 126 ++ .../RandomAccessSparseVectorStorageTest.java | 60 + .../SparseLocalOffHeapVectorStorageTest.java | 78 ++ .../storage/vector/VectorArrayStorageTest.java | 58 + .../storage/vector/VectorBaseStorageTest.java | 69 ++ .../vector/VectorOffheapStorageTest.java | 73 ++ .../math/impls/vector/AbstractVectorTest.java | 543 +++++++++ .../ml/math/impls/vector/CacheVectorTest.java | 434 +++++++ .../vector/ConstantVectorConstructorTest.java | 52 + .../vector/DelegatingVectorConstructorTest.java | 62 + .../DenseLocalOffHeapVectorConstructorTest.java | 59 + .../DenseLocalOnHeapVectorConstructorTest.java | 163 +++ .../vector/FunctionVectorConstructorTest.java | 121 ++ .../math/impls/vector/MatrixVectorViewTest.java | 226 ++++ .../PivotedVectorViewConstructorTest.java | 211 ++++ .../vector/RandomVectorConstructorTest.java | 145 +++ .../SingleElementVectorConstructorTest.java | 159 +++ .../SingleElementVectorViewConstructorTest.java | 137 +++ .../SparseLocalVectorConstructorTest.java | 54 + .../math/impls/vector/VectorAttributesTest.java | 217 ++++ .../ml/math/impls/vector/VectorFoldMapTest.java | 122 ++ .../vector/VectorImplementationsFixtures.java | 655 +++++++++++ .../impls/vector/VectorImplementationsTest.java | 861 ++++++++++++++ .../math/impls/vector/VectorIterableTest.java | 376 ++++++ .../ml/math/impls/vector/VectorNormTest.java | 247 ++++ .../math/impls/vector/VectorToMatrixTest.java | 308 +++++ .../ml/math/impls/vector/VectorViewTest.java | 162 +++ 357 files changed, 27247 insertions(+), 27128 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/pom-standalone-lgpl.xml ---------------------------------------------------------------------- diff --git a/examples/pom-standalone-lgpl.xml b/examples/pom-standalone-lgpl.xml index 2b4ece0..5fbb4ea 100644 --- a/examples/pom-standalone-lgpl.xml +++ b/examples/pom-standalone-lgpl.xml @@ -113,10 +113,6 @@ <java.ver>1.8</java.ver> </properties> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <dependencies> <dependency> <groupId>org.apache.ignite</groupId> http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/pom-standalone.xml ---------------------------------------------------------------------- diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml index 64b4301..0183563 100644 --- a/examples/pom-standalone.xml +++ b/examples/pom-standalone.xml @@ -113,10 +113,6 @@ <java.ver>1.8</java.ver> </properties> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <dependencies> <dependency> <groupId>org.apache.ignite</groupId> http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index b933385..895519b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -260,10 +260,6 @@ <ml.folder>src/main/ml</ml.folder> </properties> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/CholeskyDecompositionExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/CholeskyDecompositionExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/CholeskyDecompositionExample.java index 07308f5..ebac2b1 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/CholeskyDecompositionExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/CholeskyDecompositionExample.java @@ -17,10 +17,10 @@ package org.apache.ignite.examples.ml.math.decompositions; -import org.apache.ignite.math.Matrix; -import org.apache.ignite.math.Tracer; -import org.apache.ignite.math.decompositions.CholeskyDecomposition; -import org.apache.ignite.math.impls.matrix.DenseLocalOnHeapMatrix; +import org.apache.ignite.ml.math.Matrix; +import org.apache.ignite.ml.math.Tracer; +import org.apache.ignite.ml.math.decompositions.CholeskyDecomposition; +import org.apache.ignite.ml.math.impls.matrix.DenseLocalOnHeapMatrix; /** * Example of using {@link CholeskyDecomposition}. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/EigenDecompositionExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/EigenDecompositionExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/EigenDecompositionExample.java index 16e692b..cda37f4 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/EigenDecompositionExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/EigenDecompositionExample.java @@ -17,10 +17,10 @@ package org.apache.ignite.examples.ml.math.decompositions; -import org.apache.ignite.math.Tracer; -import org.apache.ignite.math.decompositions.EigenDecomposition; -import org.apache.ignite.math.functions.Functions; -import org.apache.ignite.math.impls.matrix.DenseLocalOnHeapMatrix; +import org.apache.ignite.ml.math.Tracer; +import org.apache.ignite.ml.math.decompositions.EigenDecomposition; +import org.apache.ignite.ml.math.functions.Functions; +import org.apache.ignite.ml.math.impls.matrix.DenseLocalOnHeapMatrix; /** * Example of using {@link EigenDecomposition}. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/LUDecompositionExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/LUDecompositionExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/LUDecompositionExample.java index c670eab..a815047 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/LUDecompositionExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/LUDecompositionExample.java @@ -17,10 +17,10 @@ package org.apache.ignite.examples.ml.math.decompositions; -import org.apache.ignite.math.Matrix; -import org.apache.ignite.math.Tracer; -import org.apache.ignite.math.decompositions.LUDecomposition; -import org.apache.ignite.math.impls.matrix.DenseLocalOnHeapMatrix; +import org.apache.ignite.ml.math.Matrix; +import org.apache.ignite.ml.math.Tracer; +import org.apache.ignite.ml.math.decompositions.LUDecomposition; +import org.apache.ignite.ml.math.impls.matrix.DenseLocalOnHeapMatrix; /** * Example of using {@link LUDecomposition}. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/SingularValueDecompositionExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/SingularValueDecompositionExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/SingularValueDecompositionExample.java index 281fbc4..81406ae 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/SingularValueDecompositionExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/decompositions/SingularValueDecompositionExample.java @@ -17,9 +17,9 @@ package org.apache.ignite.examples.ml.math.decompositions; -import org.apache.ignite.math.Tracer; -import org.apache.ignite.math.decompositions.SingularValueDecomposition; -import org.apache.ignite.math.impls.matrix.DenseLocalOnHeapMatrix; +import org.apache.ignite.ml.math.Tracer; +import org.apache.ignite.ml.math.decompositions.SingularValueDecomposition; +import org.apache.ignite.ml.math.impls.matrix.DenseLocalOnHeapMatrix; /** * Example of using {@link SingularValueDecomposition}. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/CacheMatrixExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/CacheMatrixExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/CacheMatrixExample.java index 80f861f..ec414e5 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/CacheMatrixExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/CacheMatrixExample.java @@ -21,11 +21,11 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.Ignition; import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.math.IdentityValueMapper; -import org.apache.ignite.math.MatrixKeyMapper; -import org.apache.ignite.math.ValueMapper; -import org.apache.ignite.math.functions.Functions; -import org.apache.ignite.math.impls.matrix.CacheMatrix; +import org.apache.ignite.ml.math.IdentityValueMapper; +import org.apache.ignite.ml.math.MatrixKeyMapper; +import org.apache.ignite.ml.math.ValueMapper; +import org.apache.ignite.ml.math.functions.Functions; +import org.apache.ignite.ml.math.impls.matrix.CacheMatrix; /** */ public class CacheMatrixExample { http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/ExampleMatrixStorage.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/ExampleMatrixStorage.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/ExampleMatrixStorage.java index d0c8604..5fb06d7 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/ExampleMatrixStorage.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/ExampleMatrixStorage.java @@ -22,10 +22,10 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.Arrays; -import org.apache.ignite.math.MatrixStorage; +import org.apache.ignite.ml.math.MatrixStorage; /** - * Example matrix storage, modeled after {@link org.apache.ignite.math.impls.storage.matrix.ArrayMatrixStorage}. + * Example matrix storage, modeled after {@link org.apache.ignite.ml.math.impls.storage.matrix.ArrayMatrixStorage}. */ class ExampleMatrixStorage implements MatrixStorage { /** Backing data array. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixCustomStorageExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixCustomStorageExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixCustomStorageExample.java index b3df9f1..76716cc 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixCustomStorageExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixCustomStorageExample.java @@ -17,11 +17,11 @@ package org.apache.ignite.examples.ml.math.matrix; -import org.apache.ignite.math.Matrix; -import org.apache.ignite.math.MatrixStorage; -import org.apache.ignite.math.Vector; -import org.apache.ignite.math.impls.matrix.AbstractMatrix; -import org.apache.ignite.math.impls.vector.DenseLocalOnHeapVector; +import org.apache.ignite.ml.math.Matrix; +import org.apache.ignite.ml.math.MatrixStorage; +import org.apache.ignite.ml.math.Vector; +import org.apache.ignite.ml.math.impls.matrix.AbstractMatrix; +import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector; /** * This example shows how to use {@link Matrix} API based on custom {@link MatrixStorage}. @@ -82,7 +82,7 @@ public final class MatrixCustomStorageExample { /** * Example of vector with custom storage, modeled after - * {@link org.apache.ignite.math.impls.matrix.DenseLocalOnHeapMatrix}. + * {@link org.apache.ignite.ml.math.impls.matrix.DenseLocalOnHeapMatrix}. */ static class MatrixCustomStorage extends AbstractMatrix { /** http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixExample.java index 66f50d5..66db374 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixExample.java @@ -17,8 +17,8 @@ package org.apache.ignite.examples.ml.math.matrix; -import org.apache.ignite.math.Matrix; -import org.apache.ignite.math.impls.matrix.DenseLocalOnHeapMatrix; +import org.apache.ignite.ml.math.Matrix; +import org.apache.ignite.ml.math.impls.matrix.DenseLocalOnHeapMatrix; /** * This example shows how to use {@link Matrix} API. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixExampleUtil.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixExampleUtil.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixExampleUtil.java index bf406a8..af12e15 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixExampleUtil.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/MatrixExampleUtil.java @@ -17,8 +17,8 @@ package org.apache.ignite.examples.ml.math.matrix; -import org.apache.ignite.math.Matrix; -import org.apache.ignite.math.Tracer; +import org.apache.ignite.ml.math.Matrix; +import org.apache.ignite.ml.math.Tracer; /** * Utility functions for {@link Matrix} API examples. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/OffHeapMatrixExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/OffHeapMatrixExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/OffHeapMatrixExample.java index 71dc2b8..f743bd9 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/OffHeapMatrixExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/OffHeapMatrixExample.java @@ -17,8 +17,8 @@ package org.apache.ignite.examples.ml.math.matrix; -import org.apache.ignite.math.Matrix; -import org.apache.ignite.math.impls.matrix.DenseLocalOffHeapMatrix; +import org.apache.ignite.ml.math.Matrix; +import org.apache.ignite.ml.math.impls.matrix.DenseLocalOffHeapMatrix; /** * This example shows how to use off-heap {@link Matrix} API. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/SparseDistributedMatrixExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/SparseDistributedMatrixExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/SparseDistributedMatrixExample.java index ffbd9af..1e5f099 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/SparseDistributedMatrixExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/SparseDistributedMatrixExample.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.ignite.examples.ml.math.matrix; import org.apache.ignite.Ignite; import org.apache.ignite.Ignition; -import org.apache.ignite.math.StorageConstants; -import org.apache.ignite.math.impls.matrix.SparseDistributedMatrix; +import org.apache.ignite.ml.math.StorageConstants; +import org.apache.ignite.ml.math.impls.matrix.SparseDistributedMatrix; import org.apache.ignite.thread.IgniteThread; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/SparseMatrixExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/SparseMatrixExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/SparseMatrixExample.java index d63d985..d3715ea 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/SparseMatrixExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/matrix/SparseMatrixExample.java @@ -17,8 +17,8 @@ package org.apache.ignite.examples.ml.math.matrix; -import org.apache.ignite.math.Matrix; -import org.apache.ignite.math.impls.matrix.SparseLocalOnHeapMatrix; +import org.apache.ignite.ml.math.Matrix; +import org.apache.ignite.ml.math.impls.matrix.SparseLocalOnHeapMatrix; /** * This example shows how to use sparse {@link Matrix} API. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/tracer/TracerExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/tracer/TracerExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/tracer/TracerExample.java index 0bf7743..085153c 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/tracer/TracerExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/tracer/TracerExample.java @@ -19,8 +19,8 @@ package org.apache.ignite.examples.ml.math.tracer; import java.awt.Color; import java.io.IOException; -import org.apache.ignite.math.Tracer; -import org.apache.ignite.math.impls.matrix.DenseLocalOnHeapMatrix; +import org.apache.ignite.ml.math.Tracer; +import org.apache.ignite.ml.math.impls.matrix.DenseLocalOnHeapMatrix; /** * Example of using {@link Tracer} utility API. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/CacheVectorExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/CacheVectorExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/CacheVectorExample.java index 3e83ef5..789248c 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/CacheVectorExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/CacheVectorExample.java @@ -21,10 +21,10 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.Ignition; import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.math.IdentityValueMapper; -import org.apache.ignite.math.ValueMapper; -import org.apache.ignite.math.VectorKeyMapper; -import org.apache.ignite.math.impls.vector.CacheVector; +import org.apache.ignite.ml.math.IdentityValueMapper; +import org.apache.ignite.ml.math.ValueMapper; +import org.apache.ignite.ml.math.VectorKeyMapper; +import org.apache.ignite.ml.math.impls.vector.CacheVector; /** * This example shows how to use {@link CacheVector} API. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/ExampleVectorStorage.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/ExampleVectorStorage.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/ExampleVectorStorage.java index b382c46..bc46b63 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/ExampleVectorStorage.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/ExampleVectorStorage.java @@ -22,10 +22,10 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.Arrays; -import org.apache.ignite.math.VectorStorage; +import org.apache.ignite.ml.math.VectorStorage; /** - * Example vector storage, modeled after {@link org.apache.ignite.math.impls.storage.vector.ArrayVectorStorage}. + * Example vector storage, modeled after {@link org.apache.ignite.ml.math.impls.storage.vector.ArrayVectorStorage}. */ class ExampleVectorStorage implements VectorStorage { /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/OffHeapVectorExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/OffHeapVectorExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/OffHeapVectorExample.java index 031843b..f470aef 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/OffHeapVectorExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/OffHeapVectorExample.java @@ -18,8 +18,8 @@ package org.apache.ignite.examples.ml.math.vector; import java.util.Arrays; -import org.apache.ignite.math.Vector; -import org.apache.ignite.math.impls.vector.DenseLocalOffHeapVector; +import org.apache.ignite.ml.math.Vector; +import org.apache.ignite.ml.math.impls.vector.DenseLocalOffHeapVector; /** * This example shows how to use off-heap {@link Vector} API. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/SparseVectorExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/SparseVectorExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/SparseVectorExample.java index f5678f6..8ace55b 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/SparseVectorExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/SparseVectorExample.java @@ -18,10 +18,10 @@ package org.apache.ignite.examples.ml.math.vector; import java.util.Arrays; -import org.apache.ignite.math.Vector; -import org.apache.ignite.math.impls.vector.SparseLocalVector; +import org.apache.ignite.ml.math.Vector; +import org.apache.ignite.ml.math.impls.vector.SparseLocalVector; -import static org.apache.ignite.math.StorageConstants.RANDOM_ACCESS_MODE; +import static org.apache.ignite.ml.math.StorageConstants.RANDOM_ACCESS_MODE; /** * This example shows how to use sparse {@link Vector} API. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/VectorCustomStorageExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/VectorCustomStorageExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/VectorCustomStorageExample.java index 2d549ae..a7204ad 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/VectorCustomStorageExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/VectorCustomStorageExample.java @@ -18,11 +18,11 @@ package org.apache.ignite.examples.ml.math.vector; import java.util.Arrays; -import org.apache.ignite.math.Matrix; -import org.apache.ignite.math.Vector; -import org.apache.ignite.math.VectorStorage; -import org.apache.ignite.math.impls.matrix.DenseLocalOnHeapMatrix; -import org.apache.ignite.math.impls.vector.AbstractVector; +import org.apache.ignite.ml.math.Matrix; +import org.apache.ignite.ml.math.Vector; +import org.apache.ignite.ml.math.VectorStorage; +import org.apache.ignite.ml.math.impls.matrix.DenseLocalOnHeapMatrix; +import org.apache.ignite.ml.math.impls.vector.AbstractVector; /** * This example shows how to use {@link Vector} based on custom {@link VectorStorage}. @@ -78,7 +78,7 @@ public final class VectorCustomStorageExample { /** * Example of vector with custom storage, modeled after - * {@link org.apache.ignite.math.impls.vector.DenseLocalOnHeapVector}. + * {@link org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector}. */ static class VectorCustomStorage extends AbstractVector { /** @@ -118,7 +118,7 @@ public final class VectorCustomStorageExample { /** {@inheritDoc */ @Override public Vector like(int crd) { - return new org.apache.ignite.math.impls.vector.DenseLocalOnHeapVector(crd); + return new org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector(crd); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/VectorExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/VectorExample.java b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/VectorExample.java index d6971a7..3390de5 100644 --- a/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/VectorExample.java +++ b/examples/src/main/ml/org/apache/ignite/examples/ml/math/vector/VectorExample.java @@ -18,8 +18,8 @@ package org.apache.ignite.examples.ml.math.vector; import java.util.Arrays; -import org.apache.ignite.math.Vector; -import org.apache.ignite.math.impls.vector.DenseLocalOnHeapVector; +import org.apache.ignite.ml.math.Vector; +import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector; /** * This example shows how to use {@link Vector} API. http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/modules/ml/pom.xml ---------------------------------------------------------------------- diff --git a/modules/ml/pom.xml b/modules/ml/pom.xml index 4755a2c..e6f5acb 100644 --- a/modules/ml/pom.xml +++ b/modules/ml/pom.xml @@ -100,10 +100,4 @@ </plugin> </plugins> </build> - - <profiles> - <profile> - <id>math</id> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/modules/ml/src/main/java/org/apache/ignite/math/Algebra.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/math/Algebra.java b/modules/ml/src/main/java/org/apache/ignite/math/Algebra.java deleted file mode 100644 index 6bfd608..0000000 --- a/modules/ml/src/main/java/org/apache/ignite/math/Algebra.java +++ /dev/null @@ -1,571 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -/* -Copyright 1999 CERN - European Organization for Nuclear Research. -Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose -is hereby granted without fee, provided that the above copyright notice appear in all copies and -that both that copyright notice and this permission notice appear in supporting documentation. -CERN makes no representations about the suitability of this software for any purpose. -It is provided "as is" without expressed or implied warranty. -*/ - -package org.apache.ignite.math; - -/** - * Miscellaneous arithmetic and algebra functions. - * Lifted from Apache Mahout. - */ -public class Algebra extends Constants { - /** */ private static final double[] STIRLING_CORRECTION = { - 0.0, - 8.106146679532726e-02, 4.134069595540929e-02, - 2.767792568499834e-02, 2.079067210376509e-02, - 1.664469118982119e-02, 1.387612882307075e-02, - 1.189670994589177e-02, 1.041126526197209e-02, - 9.255462182712733e-03, 8.330563433362871e-03, - 7.573675487951841e-03, 6.942840107209530e-03, - 6.408994188004207e-03, 5.951370112758848e-03, - 5.554733551962801e-03, 5.207655919609640e-03, - 4.901395948434738e-03, 4.629153749334029e-03, - 4.385560249232324e-03, 4.166319691996922e-03, - 3.967954218640860e-03, 3.787618068444430e-03, - 3.622960224683090e-03, 3.472021382978770e-03, - 3.333155636728090e-03, 3.204970228055040e-03, - 3.086278682608780e-03, 2.976063983550410e-03, - 2.873449362352470e-03, 2.777674929752690e-03, - }; - - /** */ private static final double[] LOG_FACTORIALS = { - 0.00000000000000000, 0.00000000000000000, 0.69314718055994531, - 1.79175946922805500, 3.17805383034794562, 4.78749174278204599, - 6.57925121201010100, 8.52516136106541430, 10.60460290274525023, - 12.80182748008146961, 15.10441257307551530, 17.50230784587388584, - 19.98721449566188615, 22.55216385312342289, 25.19122118273868150, - 27.89927138384089157, 30.67186010608067280, 33.50507345013688888, - 36.39544520803305358, 39.33988418719949404, 42.33561646075348503, - 45.38013889847690803, 48.47118135183522388, 51.60667556776437357, - 54.78472939811231919, 58.00360522298051994, 61.26170176100200198, - 64.55753862700633106, 67.88974313718153498, 71.25703896716800901 - }; - - /** */ private static final long[] LONG_FACTORIALS = { - 1L, - 1L, - 2L, - 6L, - 24L, - 120L, - 720L, - 5040L, - 40320L, - 362880L, - 3628800L, - 39916800L, - 479001600L, - 6227020800L, - 87178291200L, - 1307674368000L, - 20922789888000L, - 355687428096000L, - 6402373705728000L, - 121645100408832000L, - 2432902008176640000L - }; - - /** */ private static final double[] DOUBLE_FACTORIALS = { - 5.109094217170944E19, - 1.1240007277776077E21, - 2.585201673888498E22, - 6.204484017332394E23, - 1.5511210043330984E25, - 4.032914611266057E26, - 1.0888869450418352E28, - 3.048883446117138E29, - 8.841761993739701E30, - 2.652528598121911E32, - 8.222838654177924E33, - 2.6313083693369355E35, - 8.68331761881189E36, - 2.952327990396041E38, - 1.0333147966386144E40, - 3.719933267899013E41, - 1.3763753091226346E43, - 5.23022617466601E44, - 2.0397882081197447E46, - 8.15915283247898E47, - 3.34525266131638E49, - 1.4050061177528801E51, - 6.041526306337384E52, - 2.6582715747884495E54, - 1.196222208654802E56, - 5.502622159812089E57, - 2.5862324151116827E59, - 1.2413915592536068E61, - 6.082818640342679E62, - 3.0414093201713376E64, - 1.5511187532873816E66, - 8.06581751709439E67, - 4.274883284060024E69, - 2.308436973392413E71, - 1.2696403353658264E73, - 7.109985878048632E74, - 4.052691950487723E76, - 2.350561331282879E78, - 1.386831185456898E80, - 8.32098711274139E81, - 5.075802138772246E83, - 3.146997326038794E85, - 1.9826083154044396E87, - 1.2688693218588414E89, - 8.247650592082472E90, - 5.443449390774432E92, - 3.6471110918188705E94, - 2.48003554243683E96, - 1.7112245242814127E98, - 1.1978571669969892E100, - 8.504785885678624E101, - 6.123445837688612E103, - 4.470115461512686E105, - 3.307885441519387E107, - 2.4809140811395404E109, - 1.8854947016660506E111, - 1.451830920282859E113, - 1.1324281178206295E115, - 8.94618213078298E116, - 7.15694570462638E118, - 5.797126020747369E120, - 4.7536433370128435E122, - 3.94552396972066E124, - 3.314240134565354E126, - 2.8171041143805494E128, - 2.4227095383672744E130, - 2.107757298379527E132, - 1.854826422573984E134, - 1.6507955160908465E136, - 1.4857159644817605E138, - 1.3520015276784033E140, - 1.2438414054641305E142, - 1.156772507081641E144, - 1.0873661566567426E146, - 1.0329978488239061E148, - 9.916779348709491E149, - 9.619275968248216E151, - 9.426890448883248E153, - 9.332621544394415E155, - 9.332621544394418E157, - 9.42594775983836E159, - 9.614466715035125E161, - 9.902900716486178E163, - 1.0299016745145631E166, - 1.0813967582402912E168, - 1.1462805637347086E170, - 1.2265202031961373E172, - 1.324641819451829E174, - 1.4438595832024942E176, - 1.5882455415227423E178, - 1.7629525510902457E180, - 1.974506857221075E182, - 2.2311927486598138E184, - 2.543559733472186E186, - 2.925093693493014E188, - 3.393108684451899E190, - 3.96993716080872E192, - 4.6845258497542896E194, - 5.574585761207606E196, - 6.689502913449135E198, - 8.094298525273444E200, - 9.875044200833601E202, - 1.2146304367025332E205, - 1.506141741511141E207, - 1.882677176888926E209, - 2.3721732428800483E211, - 3.0126600184576624E213, - 3.856204823625808E215, - 4.974504222477287E217, - 6.466855489220473E219, - 8.471580690878813E221, - 1.1182486511960037E224, - 1.4872707060906847E226, - 1.99294274616152E228, - 2.690472707318049E230, - 3.6590428819525483E232, - 5.0128887482749884E234, - 6.917786472619482E236, - 9.615723196941089E238, - 1.3462012475717523E241, - 1.8981437590761713E243, - 2.6953641378881633E245, - 3.8543707171800694E247, - 5.550293832739308E249, - 8.047926057471989E251, - 1.1749972043909107E254, - 1.72724589045464E256, - 2.5563239178728637E258, - 3.8089226376305687E260, - 5.7133839564458575E262, - 8.627209774233244E264, - 1.3113358856834527E267, - 2.0063439050956838E269, - 3.0897696138473515E271, - 4.789142901463393E273, - 7.471062926282892E275, - 1.1729568794264134E278, - 1.8532718694937346E280, - 2.946702272495036E282, - 4.714723635992061E284, - 7.590705053947223E286, - 1.2296942187394494E289, - 2.0044015765453032E291, - 3.287218585534299E293, - 5.423910666131583E295, - 9.003691705778434E297, - 1.5036165148649983E300, - 2.5260757449731988E302, - 4.2690680090047056E304, - 7.257415615308004E306 - }; - - /** - * Efficiently returns the binomial coefficient, often also referred to as - * "n over k" or "n choose k". The binomial coefficient is defined as - * {@code (n * n-1 * ... * n-k+1 ) / ( 1 * 2 * ... * k )}. - * <ul> <li>{@code k<0}: {@code 0}.</li> - * <li>{@code k==0}: {@code 1}.</li> - * <li>{@code k==1}: {@code n}.</li> - * <li>else: {@code (n * n-1 * ... * n-k+1 ) / ( 1 * 2 * ... * k)}.</li> - * </ul> - * - * @param n - * @param k - * @return Binomial coefficient. - */ - public static double binomial(double n, long k) { - if (k < 0) - return 0; - - if (k == 0) - return 1; - - if (k == 1) - return n; - - // binomial(n,k) = (n * n-1 * ... * n-k+1 ) / ( 1 * 2 * ... * k ) - double a = n - k + 1; - double b = 1; - double binomial = 1; - - for (long i = k; i-- > 0; ) - binomial *= (a++) / (b++); - - return binomial; - } - - /** - * Efficiently returns the binomial coefficient, often also referred to as "n over k" or "n choose k". - * The binomial coefficient is defined as - * <ul> <li>{@code k<0}: {@code 0}. <li>{@code k==0 || k==n}: {@code 1}. <li>{@code k==1 || k==n-1}: - * {@code n}. <li>else: {@code (n * n-1 * ... * n-k+1 ) / ( 1 * 2 * ... * k )}. </ul> - * - * @param n - * @param k - * @return Binomial coefficient. - */ - public static double binomial(long n, long k) { - if (k < 0) - return 0; - - if (k == 0 || k == n) - return 1; - - if (k == 1 || k == n - 1) - return n; - - if (n > k) { - int max = LONG_FACTORIALS.length + DOUBLE_FACTORIALS.length; - - if (n < max) { - double nFac = factorial((int)n); - double kFac = factorial((int)k); - double nMinusKFac = factorial((int)(n - k)); - double nk = nMinusKFac * kFac; - - if (nk != Double.POSITIVE_INFINITY) // No numeric overflow? - return nFac / nk; - } - - if (k > n / 2) - k = n - k; - } - - // binomial(n,k) = (n * n-1 * ... * n-k+1 ) / ( 1 * 2 * ... * k ) - long a = n - k + 1; - long b = 1; - double binomial = 1; - - for (long i = k; i-- > 0; ) - binomial *= (double)a++ / (b++); - - return binomial; - } - - /** - * Returns the smallest <code>long >= value</code>. - * <dl><dt>Examples: {@code 1.0 -> 1, 1.2 -> 2, 1.9 -> 2}. This - * method is safer than using (long) Math.ceil(value), because of possible rounding error.</dt></dl> - * - * @param val - */ - public static long ceil(double val) { - return Math.round(Math.ceil(val)); - } - - /** - * Evaluates the series of Chebyshev polynomials Ti at argument x/2. The series is given by - * <pre> - * N-1 - * - ' - * y = > coef[i] T (x/2) - * - i - * i=0 - * </pre> - * Coefficients are stored in reverse order, i.e. the zero order term is last in the array. Note N is the number of - * coefficients, not the order. <p> If coefficients are for the interval a to b, x must have been transformed to x - * -< 2(2x - b - a)/(b-a) before entering the routine. This maps x from (a, b) to (-1, 1), over which the - * Chebyshev polynomials are defined. <p> If the coefficients are for the inverted interval, in which (a, b) is - * mapped to (1/b, 1/a), the transformation required is {@code x -> 2(2ab/x - b - a)/(b-a)}. If b is infinity, this - * becomes {@code x -> 4a/x - 1}. <p> SPEED: <p> Taking advantage of the recurrence properties of the Chebyshev - * polynomials, the routine requires one more addition per loop than evaluating a nested polynomial of the same - * degree. - * - * @param x Argument to the polynomial. - * @param coef Coefficients of the polynomial. - * @param N Number of coefficients. - */ - public static double chbevl(double x, double[] coef, int N) { - int p = 0; - - double b0 = coef[p++]; - double b1 = 0.0; - int i = N - 1; - - double b2; - - do { - b2 = b1; - b1 = b0; - b0 = x * b1 - b2 + coef[p++]; - } - while (--i > 0); - - return 0.5 * (b0 - b2); - } - - /** - * Instantly returns the factorial {@code k!}. - * - * @param k must hold {@code k >= 0}. - */ - private static double factorial(int k) { - if (k < 0) - throw new IllegalArgumentException(); - - int len1 = LONG_FACTORIALS.length; - - if (k < len1) - return LONG_FACTORIALS[k]; - - int len2 = DOUBLE_FACTORIALS.length; - - return (k < len1 + len2) ? DOUBLE_FACTORIALS[k - len1] : Double.POSITIVE_INFINITY; - } - - /** - * Returns the largest <code>long <= value</code>. - * <dl><dt>Examples: {@code 1.0 -> 1, 1.2 -> 1, 1.9 -> 1 <dt> 2.0 -> 2, 2.2 -> 2, 2.9 -> 2}</dt></dl> - * This method is safer than using (long) Math.floor(value), because of possible rounding error. - */ - public static long floor(double val) { - return Math.round(Math.floor(val)); - } - - /** - * Returns {@code log<sub>base</sub>value}. - */ - public static double log(double base, double val) { - return Math.log(val) / Math.log(base); - } - - /** - * Returns {@code log<sub>10</sub>value}. - */ - public static double log10(double val) { - // 1.0 / Math.log(10) == 0.43429448190325176 - return Math.log(val) * 0.43429448190325176; - } - - /** - * Returns {@code log<sub>2</sub>value}. - */ - public static double log2(double val) { - // 1.0 / Math.log(2) == 1.4426950408889634 - return Math.log(val) * 1.4426950408889634; - } - - /** - * Returns {@code log(k!)}. Tries to avoid overflows. For {@code k<30} simply looks up a table in O(1). - * For {@code k>=30} uses stirlings approximation. - * - * @param k must hold {@code k >= 0}. - */ - public static double logFactorial(int k) { - if (k >= 30) { - double r = 1.0 / k; - double rr = r * r; - double C7 = -5.95238095238095238e-04; - double C5 = 7.93650793650793651e-04; - double C3 = -2.77777777777777778e-03; - double C1 = 8.33333333333333333e-02; - double C0 = 9.18938533204672742e-01; - - return (k + 0.5) * Math.log(k) - k + C0 + r * (C1 + rr * (C3 + rr * (C5 + rr * C7))); - } - else - return LOG_FACTORIALS[k]; - } - - /** - * Instantly returns the factorial {@code k!}. - * - * @param k must hold {@code k >= 0 && k < 21} - */ - public static long longFactorial(int k) { - if (k < 0) - throw new IllegalArgumentException("Negative k"); - - if (k < LONG_FACTORIALS.length) - return LONG_FACTORIALS[k]; - - throw new IllegalArgumentException("Overflow"); - } - - /** - * Returns the StirlingCorrection. - * - * Correction term of the Stirling approximation for {@code log(k!)} (series in - * 1/k, or table values for small k) with int parameter k. </p> {@code log k! = (k + 1/2)log(k + 1) - (k + 1) + - * (1/2)log(2Pi) + STIRLING_CORRECTION(k + 1) log k! = (k + 1/2)log(k) - k + (1/2)log(2Pi) + - * STIRLING_CORRECTION(k) } - */ - public static double stirlingCorrection(int k) { - if (k > 30) { - double r = 1.0 / k; - double rr = r * r; - double C7 = -5.95238095238095238e-04; - double C5 = 7.93650793650793651e-04; - double C3 = -2.77777777777777778e-03; - double C1 = 8.33333333333333333e-02; - - return r * (C1 + rr * (C3 + rr * (C5 + rr * C7))); - } - else - return STIRLING_CORRECTION[k]; - } - - /** - * Evaluates the given polynomial of degree {@code N} at {@code x}, assuming coefficient of N is 1.0. Otherwise same - * as {@link #evalPoly(double, double[], int)}. - * <pre> - * 2 N - * y = C + C x + C x +...+ C x - * 0 1 2 N - * - * where C = 1 and hence is omitted from the array. - * N - * - * Coefficients are stored in reverse order: - * - * coef[0] = C , ..., coef[N-1] = C . - * N-1 0 - * - * Calling arguments are otherwise the same as {@link #evalPoly(double, double[], int)}. - * </pre> - * In the interest of speed, there are no checks for out of bounds arithmetic. - * - * @param x Argument to the polynomial. - * @param coef Coefficients of the polynomial. - * @param n Degree of the polynomial. - */ - public static double evalPoly1(double x, double[] coef, int n) { - double res = x + coef[0]; - - for (int i = 1; i < n; i++) - res = res * x + coef[i]; - - return res; - } - - /** - * Evaluates the given polynomial of degree {@code N} at {@code x}. - * <pre> - * 2 N - * y = C + C x + C x +...+ C x - * 0 1 2 N - * - * Coefficients are stored in reverse order: - * - * coef[0] = C , ..., coef[N] = C . - * N 0 - * </pre> - * In the interest of speed, there are no checks for out of bounds arithmetic. - * - * @param x Argument to the polynomial. - * @param coef Coefficients of the polynomial. - * @param n Degree of the polynomial. - */ - public static double evalPoly(double x, double[] coef, int n) { - double res = coef[0]; - - for (int i = 1; i <= n; i++) - res = res * x + coef[i]; - - return res; - } - - /** - * Gets <code>sqrt(a^2 + b^2)</code> without under/overflow. - * - * @param a - * @param b - */ - public static double hypot(double a, double b) { - double r; - - if (Math.abs(a) > Math.abs(b)) { - r = b / a; - r = Math.abs(a) * Math.sqrt(1 + r * r); - } - else if (b != 0) { - r = a / b; - r = Math.abs(b) * Math.sqrt(1 + r * r); - } - else - r = 0.0; - - return r; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/modules/ml/src/main/java/org/apache/ignite/math/Constants.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/math/Constants.java b/modules/ml/src/main/java/org/apache/ignite/math/Constants.java deleted file mode 100644 index 02756b6..0000000 --- a/modules/ml/src/main/java/org/apache/ignite/math/Constants.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -/* -Copyright 1999 CERN - European Organization for Nuclear Research. -Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose -is hereby granted without fee, provided that the above copyright notice appear in all copies and -that both that copyright notice and this permission notice appear in supporting documentation. -CERN makes no representations about the suitability of this software for any purpose. -It is provided "as is" without expressed or implied warranty. -*/ - -package org.apache.ignite.math; - -/** - * Math constants. Lifted from Apache Mahout. - */ -public class Constants { - /** */ public static final double MACHEP = 1.11022302462515654042E-16; - /** */ public static final double MAXLOG = 7.09782712893383996732E2; - /** */ public static final double MINLOG = -7.451332191019412076235E2; - /** */ public static final double MAXGAM = 171.624376956302725; - /** */ public static final double SQTPI = 2.50662827463100050242E0; - /** */ public static final double SQRTH = 7.07106781186547524401E-1; - /** */ public static final double LOGPI = 1.14472988584940017414; - /** */ public static final double BIG = 4.503599627370496e15; - /** */ public static final double BIGINV = 2.22044604925031308085e-16; -} http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/modules/ml/src/main/java/org/apache/ignite/math/Destroyable.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/math/Destroyable.java b/modules/ml/src/main/java/org/apache/ignite/math/Destroyable.java deleted file mode 100644 index f3b467c..0000000 --- a/modules/ml/src/main/java/org/apache/ignite/math/Destroyable.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.apache.ignite.math; - -/** - * Support for destroying objects that are managed outside of JVM. - */ -public interface Destroyable { - /** - * Destroys object if managed outside of JVM. It's a no-op in all other cases. - */ - public default void destroy() { - // No-op. - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/modules/ml/src/main/java/org/apache/ignite/math/IdentityValueMapper.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/math/IdentityValueMapper.java b/modules/ml/src/main/java/org/apache/ignite/math/IdentityValueMapper.java deleted file mode 100644 index 65c7024..0000000 --- a/modules/ml/src/main/java/org/apache/ignite/math/IdentityValueMapper.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.apache.ignite.math; - -/** - * Identity value mapper. - */ -public class IdentityValueMapper implements ValueMapper<Double> { - /** */ private static final long serialVersionUID = -8010078306142216389L; - - /** {@inheritDoc} */ - @Override public Double fromDouble(double v) { - return v; - } - - /** {@inheritDoc} */ - @Override public double toDouble(Double v) { - assert v != null; - - return v; - } - - /** {@inheritDoc} */ - @Override public int hashCode() { - return Long.hashCode(serialVersionUID); - } - - /** {@inheritDoc} */ - @Override public boolean equals(Object o) { - if (this == o) - return true; - - if (o == null || getClass() != o.getClass()) - return false; - - return true; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/0abf6601/modules/ml/src/main/java/org/apache/ignite/math/KeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/math/KeyMapper.java b/modules/ml/src/main/java/org/apache/ignite/math/KeyMapper.java deleted file mode 100644 index f4f9a39..0000000 --- a/modules/ml/src/main/java/org/apache/ignite/math/KeyMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.apache.ignite.math; - -import java.io.Serializable; - -/** - * Maps key objects to index in {@link Vector} or {@link Matrix}. - */ -public interface KeyMapper<K> extends Serializable { - /** - * Checks given cache key corresponds to a valid index in vector or matrix. - * - * @param k Key to check. - * @return {@code true} if there is a valid index, {@code false} otherwise. - */ - public boolean isValid(K k); -}