You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/07/25 06:34:19 UTC
[01/18] ignite git commit: IGNITE-8981: [ML] Parallel optimizations
for BaggingTrainer
Repository: ignite
Updated Branches:
refs/heads/ignite-6467-1 6673031ec -> 0df5e61a5
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java
index 27ddc6d..3521cb6 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java
@@ -25,10 +25,10 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.ml.TestUtils;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.Tracer;
-import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.nn.architecture.MLPArchitecture;
import org.apache.ignite.ml.optimization.LossFunctions;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerTest.java
index 5e61fe6..a1d601c 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerTest.java
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Map;
import org.apache.ignite.ml.TestUtils;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.nn.architecture.MLPArchitecture;
import org.apache.ignite.ml.optimization.LossFunctions;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java
index e11a829..bd31b19 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.nn.Activators;
import org.apache.ignite.ml.nn.MLPTrainer;
import org.apache.ignite.ml.nn.MultilayerPerceptron;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistTest.java
index e2c905f..6a17d18 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistTest.java
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.nn.Activators;
import org.apache.ignite.ml.nn.MLPTrainer;
import org.apache.ignite.ml.nn.MultilayerPerceptron;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModelTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModelTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModelTest.java
index d5af7f3..71d831d 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModelTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModelTest.java
@@ -18,8 +18,8 @@
package org.apache.ignite.ml.regressions.linear;
import org.apache.ignite.ml.TestUtils;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionModel;
import org.apache.ignite.ml.regressions.logistic.multiclass.LogRegressionMultiClassModel;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/logistic/LogisticRegressionModelTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/regressions/logistic/LogisticRegressionModelTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/logistic/LogisticRegressionModelTest.java
index 679bd50..bb6a77d 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/regressions/logistic/LogisticRegressionModelTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/logistic/LogisticRegressionModelTest.java
@@ -18,8 +18,8 @@
package org.apache.ignite.ml.regressions.logistic;
import org.apache.ignite.ml.TestUtils;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionModel;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMModelTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMModelTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMModelTest.java
index e88e16e..9244c35 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMModelTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMModelTest.java
@@ -18,8 +18,8 @@
package org.apache.ignite.ml.svm;
import org.apache.ignite.ml.TestUtils;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.regressions.linear.LinearRegressionModel;
import org.junit.Assert;
[10/18] ignite git commit: IGNITE-9055: [ML] SVM throws NPE in case
of empty partitions
Posted by sb...@apache.org.
IGNITE-9055: [ML] SVM throws NPE in case of empty partitions
this closes #4412
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d0e6def7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d0e6def7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d0e6def7
Branch: refs/heads/ignite-6467-1
Commit: d0e6def704f2d1646f9bf5b4b9a19243f6d48f75
Parents: 13e2a31
Author: dmitrievanthony <dm...@gmail.com>
Authored: Tue Jul 24 17:56:50 2018 +0300
Committer: Yury Babak <yb...@gridgain.com>
Committed: Tue Jul 24 17:56:50 2018 +0300
----------------------------------------------------------------------
.../dataset/impl/cache/CacheBasedDataset.java | 3 +-
.../ml/svm/SVMBinaryTrainerIntegrationTest.java | 102 +++++++++++++++++++
.../org/apache/ignite/ml/svm/SVMTestSuite.java | 3 +-
3 files changed, 106 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d0e6def7/modules/ml/src/main/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDataset.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDataset.java b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDataset.java
index 1b492a7..67e0d56 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDataset.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDataset.java
@@ -163,7 +163,8 @@ public class CacheBasedDataset<K, V, C extends Serializable, D extends AutoClose
R res = identity;
for (R partRes : results)
- res = reduce.apply(res, partRes);
+ if (partRes != null)
+ res = reduce.apply(res, partRes);
return res;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d0e6def7/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMBinaryTrainerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMBinaryTrainerIntegrationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMBinaryTrainerIntegrationTest.java
new file mode 100644
index 0000000..d227de7
--- /dev/null
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMBinaryTrainerIntegrationTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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.ml.svm;
+
+import java.util.Arrays;
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.ml.TestUtils;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
+import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ * Tests for {@link SVMLinearBinaryClassificationTrainer} that require to start the whole Ignite infrastructure.
+ */
+public class SVMBinaryTrainerIntegrationTest extends GridCommonAbstractTest {
+ /** Fixed size of Dataset. */
+ private static final int AMOUNT_OF_OBSERVATIONS = 1000;
+
+ /** Fixed size of columns in Dataset. */
+ private static final int AMOUNT_OF_FEATURES = 2;
+
+ /** Precision in test checks. */
+ private static final double PRECISION = 1e-2;
+
+ /** Number of nodes in grid */
+ private static final int NODE_COUNT = 3;
+
+ /** Ignite instance. */
+ private Ignite ignite;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ for (int i = 1; i <= NODE_COUNT; i++)
+ startGrid(i);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() {
+ stopAllGrids();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override protected void beforeTest() throws Exception {
+ /* Grid instance. */
+ ignite = grid(NODE_COUNT);
+ ignite.configuration().setPeerClassLoadingEnabled(true);
+ IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
+ }
+
+ /**
+ * Test trainer on classification model y = x.
+ */
+ public void testTrainWithTheLinearlySeparableCase() {
+ IgniteCache<Integer, double[]> data = ignite.getOrCreateCache(UUID.randomUUID().toString());
+
+ ThreadLocalRandom rndX = ThreadLocalRandom.current();
+ ThreadLocalRandom rndY = ThreadLocalRandom.current();
+
+ for (int i = 0; i < AMOUNT_OF_OBSERVATIONS; i++) {
+ double x = rndX.nextDouble(-1000, 1000);
+ double y = rndY.nextDouble(-1000, 1000);
+ double[] vec = new double[AMOUNT_OF_FEATURES + 1];
+ vec[0] = y - x > 0 ? 1 : -1; // assign label.
+ vec[1] = x;
+ vec[2] = y;
+ data.put(i, vec);
+ }
+
+ SVMLinearBinaryClassificationTrainer trainer = new SVMLinearBinaryClassificationTrainer();
+
+ SVMLinearBinaryClassificationModel mdl = trainer.fit(
+ ignite,
+ data,
+ (k, v) -> VectorUtils.of(Arrays.copyOfRange(v, 1, v.length)),
+ (k, v) -> v[0]
+ );
+
+ TestUtils.assertEquals(-1, mdl.apply(new DenseVector(new double[]{100, 10})), PRECISION);
+ TestUtils.assertEquals(1, mdl.apply(new DenseVector(new double[]{10, 100})), PRECISION);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d0e6def7/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMTestSuite.java
index 8178e30..822ad18 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/svm/SVMTestSuite.java
@@ -27,7 +27,8 @@ import org.junit.runners.Suite;
@Suite.SuiteClasses({
SVMModelTest.class,
SVMBinaryTrainerTest.class,
- SVMMultiClassTrainerTest.class
+ SVMMultiClassTrainerTest.class,
+ SVMBinaryTrainerIntegrationTest.class
})
public class SVMTestSuite {
// No-op.
[15/18] ignite git commit: IGNITE-8428 Minor fixes in texts.
Posted by sb...@apache.org.
IGNITE-8428 Minor fixes in texts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/99e023bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/99e023bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/99e023bd
Branch: refs/heads/ignite-6467-1
Commit: 99e023bdb9f73d0876ef85e9a471eb00fd8eaeca
Parents: 0bbb8a6
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Jul 25 01:04:10 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Jul 25 01:04:10 2018 +0700
----------------------------------------------------------------------
.../frontend/app/modules/agent/AgentManager.service.js | 4 ++--
.../app/modules/agent/components/cluster-login/template.pug | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/99e023bd/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
index 4c8d95a..a1c0ff9 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -467,10 +467,10 @@ export default class AgentManager {
case SuccessStatus.AUTH_FAILED:
this.clustersSecrets.get(cluster.id).resetCredentials();
- throw new Error('Failed to authenticate in cluster with provided credentials');
+ throw new Error('Cluster authentication failed. Incorrect user and/or password.');
case SuccessStatus.SECURITY_CHECK_FAILED:
- throw new Error('Access denied. You are not authorized to access this functionality. Contact your cluster administrator.');
+ throw new Error('Access denied. You are not authorized to access this functionality.');
default:
throw new Error('Illegal status in node response');
http://git-wip-us.apache.org/repos/asf/ignite/blob/99e023bd/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug b/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug
index d1bfe18..c6bc474 100644
--- a/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug
+++ b/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug
@@ -24,17 +24,18 @@ include /app/helpers/jade/mixins
.modal-header
h4.modal-title
i.icon-confirm
- span Enter cluster credentials
+ span Cluster Authentication
button.close(type='button' aria-label='Close' ng-click='$ctrl.onHide()')
svg(ignite-icon="cross")
.modal-body
+ p Enter your credentials to access the cluster.
.row
.col-50
+form-field__text({
label: 'User:',
model: '$ctrl.secrets.user',
name: '"user"',
- placeholder: 'Input user',
+ placeholder: 'Enter user',
required: true
})(
ng-model-options='{allowInvalid: true}'
@@ -46,7 +47,7 @@ include /app/helpers/jade/mixins
label: 'Password:',
model: '$ctrl.secrets.password',
name: '"password"',
- placeholder: 'Input password',
+ placeholder: 'Enter password',
required: true
})(
autocomplete='node-password'
[13/18] ignite git commit: IGNITE-9070 Web Console: Fixed issue with
notifications from Admin panel.
Posted by sb...@apache.org.
IGNITE-9070 Web Console: Fixed issue with notifications from Admin panel.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2b6e556a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2b6e556a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2b6e556a
Branch: refs/heads/ignite-6467-1
Commit: 2b6e556aa7938529186e09745c81b8db4c3ea8ff
Parents: 53a58bc
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Jul 25 00:27:30 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Jul 25 00:27:30 2018 +0700
----------------------------------------------------------------------
modules/web-console/backend/middlewares/api.js | 5 +++++
modules/web-console/backend/routes/admin.js | 4 ++--
modules/web-console/backend/services/notifications.js | 4 +---
.../frontend/app/components/user-notifications/service.js | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b6e556a/modules/web-console/backend/middlewares/api.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/middlewares/api.js b/modules/web-console/backend/middlewares/api.js
index 464471b..9fe9373 100644
--- a/modules/web-console/backend/middlewares/api.js
+++ b/modules/web-console/backend/middlewares/api.js
@@ -39,11 +39,16 @@ module.exports.factory = () => {
res.status(err.httpCode || err.code || 500).send(err.message);
},
+
ok(data) {
if (_.isNil(data))
return res.sendStatus(404);
res.status(200).json(data);
+ },
+
+ done() {
+ res.status(200).send({res: true});
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b6e556a/modules/web-console/backend/routes/admin.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/routes/admin.js b/modules/web-console/backend/routes/admin.js
index 2c34cdb..4a38723 100644
--- a/modules/web-console/backend/routes/admin.js
+++ b/modules/web-console/backend/routes/admin.js
@@ -79,10 +79,10 @@ module.exports.factory = function(settings, mongo, spacesService, mailsService,
.catch(res.api.error);
});
- // Revert to your identity.
+ // Update notifications.
router.put('/notifications', (req, res) => {
notificationsService.merge(req.user._id, req.body.message, req.body.isShown)
- .then(res.api.ok)
+ .then(res.api.done)
.catch(res.api.error);
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b6e556a/modules/web-console/backend/services/notifications.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/services/notifications.js b/modules/web-console/backend/services/notifications.js
index af70aee..4dacf51 100644
--- a/modules/web-console/backend/services/notifications.js
+++ b/modules/web-console/backend/services/notifications.js
@@ -42,9 +42,7 @@ module.exports.factory = (mongo, browsersHnd) => {
*/
static merge(owner, message, isShown = false, date = new Date()) {
return mongo.Notifications.create({owner, message, date, isShown})
- .then(({message, date, isShown}) => {
- browsersHnd.updateNotification({message, date, isShown});
- });
+ .then(({message, date, isShown}) => browsersHnd.updateNotification({message, date, isShown}));
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b6e556a/modules/web-console/frontend/app/components/user-notifications/service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/user-notifications/service.js b/modules/web-console/frontend/app/components/user-notifications/service.js
index 15e96f8..d008482 100644
--- a/modules/web-console/frontend/app/components/user-notifications/service.js
+++ b/modules/web-console/frontend/app/components/user-notifications/service.js
@@ -61,7 +61,7 @@ export default class UserNotificationsService {
.finally(modalHide)
.then(({ message, isShown }) => {
this.$http.put('/api/v1/admin/notifications', { message, isShown })
- .catch((err) => this.Messages.showError(err));
+ .catch(this.Messages.showError);
});
}
}
[17/18] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-6467-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-6467-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5d9ca421
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5d9ca421
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5d9ca421
Branch: refs/heads/ignite-6467-1
Commit: 5d9ca421b07242d9a0ab6224c120214c7e13af41
Parents: 6673031 ac62e61
Author: sboikov <sb...@apache.org>
Authored: Wed Jul 25 09:32:52 2018 +0300
Committer: sboikov <sb...@apache.org>
Committed: Wed Jul 25 09:32:52 2018 +0300
----------------------------------------------------------------------
.../OptimizeMakeChangeFitnessFunction.java | 1 -
.../change/OptimizeMakeChangeGAExample.java | 2 -
.../OptimizeMakeChangeTerminateCriteria.java | 2 -
.../genetic/helloworld/HelloWorldGAExample.java | 2 -
.../helloworld/HelloWorldTerminateCriteria.java | 2 -
.../ml/genetic/knapsack/KnapsackGAExample.java | 2 -
.../knapsack/KnapsackTerminateCriteria.java | 1 -
.../ml/genetic/movie/MovieFitnessFunction.java | 1 -
.../ml/genetic/movie/MovieGAExample.java | 2 -
.../genetic/movie/MovieTerminateCriteria.java | 2 -
.../ml/knn/KNNClassificationExample.java | 2 +-
.../examples/ml/knn/KNNRegressionExample.java | 2 +-
.../examples/ml/nn/MLPTrainerExample.java | 2 +-
.../ml/preprocessing/BinarizationExample.java | 2 +-
.../ml/preprocessing/ImputingExample.java | 2 +-
.../ImputingExampleWithMostFrequentValues.java | 2 +-
.../ml/preprocessing/MinMaxScalerExample.java | 2 +-
.../ml/preprocessing/NormalizationExample.java | 2 +-
...ssionLSQRTrainerWithMinMaxScalerExample.java | 2 +-
...gressionMultiClassClassificationExample.java | 2 +-
.../SVMMultiClassClassificationExample.java | 2 +-
.../RandomForestRegressionExample.java | 18 +-
.../ml/tutorial/Step_1_Read_and_Learn.java | 2 +-
.../examples/ml/tutorial/Step_2_Imputing.java | 2 +-
.../examples/ml/tutorial/Step_3_Categorial.java | 2 +-
.../ml/tutorial/Step_4_Add_age_fare.java | 2 +-
.../examples/ml/tutorial/Step_5_Scaling.java | 2 +-
.../ignite/examples/ml/tutorial/Step_6_KNN.java | 2 +-
.../ml/tutorial/Step_7_Split_train_test.java | 2 +-
.../ignite/examples/ml/tutorial/Step_8_CV.java | 2 +-
.../ml/tutorial/Step_9_Go_to_LogReg.java | 2 +-
.../internal/pagemem/wal/record/DataEntry.java | 12 ++
.../pagemem/wal/record/LazyDataEntry.java | 3 +
.../GridDistributedTxRemoteAdapter.java | 44 +++--
.../wal/serializer/RecordDataV1Serializer.java | 4 +
.../datastructures/GridCacheSetImpl.java | 6 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 11 +-
...PdsAtomicCacheHistoricalRebalancingTest.java | 5 +
.../IgnitePdsCacheRebalancingAbstractTest.java | 179 +++++++++++++------
.../IgnitePdsTxCacheRebalancingTest.java | 1 -
.../IgnitePdsTxHistoricalRebalancingTest.java | 64 +++++++
modules/indexing/pom.xml | 7 +
.../IgnitePdsWithIndexingCoreTestSuite.java | 9 +-
.../main/java/org/apache/ignite/ml/Model.java | 7 +
.../ml/clustering/kmeans/KMeansModel.java | 22 ++-
.../ml/clustering/kmeans/KMeansModelFormat.java | 2 +-
.../ml/clustering/kmeans/KMeansTrainer.java | 6 +-
.../ml/composition/BaggingModelTrainer.java | 38 ++--
.../ml/composition/ModelOnFeaturesSubspace.java | 19 ++
.../ml/composition/ModelsComposition.java | 14 ++
.../boosting/GDBBinaryClassifierTrainer.java | 2 +-
.../boosting/GDBRegressionTrainer.java | 2 +-
.../ml/composition/boosting/GDBTrainer.java | 40 +++--
.../PredictionsAggregator.java | 8 +
.../WeightedPredictionsAggregator.java | 24 +++
.../ignite/ml/dataset/DatasetFactory.java | 2 +-
.../dataset/impl/cache/CacheBasedDataset.java | 3 +-
.../builder/data/SimpleDatasetDataBuilder.java | 2 +-
.../data/SimpleLabeledDatasetDataBuilder.java | 2 +-
.../ml/environment/LearningEnvironment.java | 54 ++++++
.../environment/LearningEnvironmentBuilder.java | 123 +++++++++++++
.../ml/environment/logging/ConsoleLogger.java | 102 +++++++++++
.../ml/environment/logging/CustomMLLogger.java | 105 +++++++++++
.../ignite/ml/environment/logging/MLLogger.java | 69 +++++++
.../ml/environment/logging/NoOpLogger.java | 64 +++++++
.../ml/environment/logging/package-info.java | 21 +++
.../ignite/ml/environment/package-info.java | 21 +++
.../parallelism/DefaultParallelismStrategy.java | 85 +++++++++
.../parallelism/NoParallelismStrategy.java | 87 +++++++++
.../parallelism/ParallelismStrategy.java | 47 +++++
.../ml/environment/parallelism/Promise.java | 53 ++++++
.../environment/parallelism/package-info.java | 21 +++
.../apache/ignite/ml/genetic/CrossOverJob.java | 4 +-
.../apache/ignite/ml/genetic/CrossOverTask.java | 4 +-
.../apache/ignite/ml/genetic/FitnessJob.java | 4 +-
.../apache/ignite/ml/genetic/FitnessTask.java | 4 +-
.../org/apache/ignite/ml/genetic/GAGrid.java | 3 -
.../java/org/apache/ignite/ml/genetic/Gene.java | 1 -
.../apache/ignite/ml/genetic/MutateTask.java | 5 +-
.../ignite/ml/genetic/TruncateSelectionJob.java | 3 +-
.../ml/genetic/TruncateSelectionTask.java | 4 +-
.../ml/genetic/functions/GAGridFunction.java | 4 +-
.../ml/genetic/parameter/GAConfiguration.java | 1 -
.../ignite/ml/genetic/utils/GAGridUtils.java | 3 -
.../java/org/apache/ignite/ml/knn/KNNUtils.java | 2 +-
.../classification/KNNClassificationModel.java | 17 +-
.../KNNClassificationTrainer.java | 4 +-
.../ml/knn/regression/KNNRegressionModel.java | 17 +-
.../ml/knn/regression/KNNRegressionTrainer.java | 4 +-
.../java/org/apache/ignite/ml/math/Blas.java | 2 +-
.../java/org/apache/ignite/ml/math/Tracer.java | 32 +++-
.../ml/math/distances/DistanceMeasure.java | 2 +-
.../ml/math/distances/EuclideanDistance.java | 2 +-
.../ml/math/distances/HammingDistance.java | 2 +-
.../ml/math/distances/ManhattanDistance.java | 2 +-
.../math/primitives/matrix/AbstractMatrix.java | 2 +-
.../primitives/matrix/impl/DenseMatrix.java | 6 +-
.../primitives/matrix/impl/SparseMatrix.java | 6 +-
.../math/primitives/matrix/impl/ViewMatrix.java | 6 +-
.../matrix/storage/DenseMatrixStorage.java | 2 +-
.../matrix/storage/SparseMatrixStorage.java | 2 +-
.../math/primitives/vector/AbstractVector.java | 2 +-
.../ml/math/primitives/vector/Vector.java | 3 +-
.../vector/impl/DelegatingVector.java | 6 +-
.../primitives/vector/impl/DenseVector.java | 6 +-
.../primitives/vector/impl/SparseVector.java | 4 +-
.../math/primitives/vector/impl/VectorView.java | 4 +-
.../vector/impl/VectorizedViewMatrix.java | 4 +-
.../storage/VectorizedViewMatrixStorage.java | 2 +-
.../apache/ignite/ml/math/util/MatrixUtil.java | 6 +-
.../org/apache/ignite/ml/nn/MLPTrainer.java | 6 +-
.../ignite/ml/nn/MultilayerPerceptron.java | 29 ++-
.../ignite/ml/nn/ReplicatedVectorMatrix.java | 6 +-
.../ignite/ml/optimization/LossFunctions.java | 2 +-
.../ml/optimization/SmoothParametrized.java | 4 +-
.../NesterovUpdateCalculator.java | 4 +-
.../ParameterUpdateCalculator.java | 4 +-
.../RPropUpdateCalculator.java | 4 +-
.../SimpleGDUpdateCalculator.java | 4 +-
.../binarization/BinarizationPreprocessor.java | 2 +-
.../binarization/BinarizationTrainer.java | 2 +-
.../StringEncoderPreprocessor.java | 4 +-
.../stringencoder/StringEncoderTrainer.java | 2 +-
.../imputing/ImputerPreprocessor.java | 2 +-
.../preprocessing/imputing/ImputerTrainer.java | 2 +-
.../minmaxscaling/MinMaxScalerPreprocessor.java | 2 +-
.../minmaxscaling/MinMaxScalerTrainer.java | 2 +-
.../NormalizationPreprocessor.java | 2 +-
.../normalization/NormalizationTrainer.java | 2 +-
.../linear/FeatureExtractorWrapper.java | 2 +-
.../linear/LinearRegressionLSQRTrainer.java | 6 +-
.../linear/LinearRegressionModel.java | 9 +-
.../linear/LinearRegressionSGDTrainer.java | 4 +-
.../binomial/LogisticRegressionModel.java | 9 +-
.../binomial/LogisticRegressionSGDTrainer.java | 4 +-
.../LogRegressionMultiClassModel.java | 5 +
.../LogRegressionMultiClassTrainer.java | 4 +-
.../ignite/ml/selection/cv/CrossValidation.java | 2 +-
.../cursor/CacheBasedLabelPairCursor.java | 2 +-
.../scoring/cursor/LocalLabelPairCursor.java | 2 +-
.../selection/scoring/evaluator/Evaluator.java | 2 +-
.../ignite/ml/structures/LabeledDataset.java | 2 +-
...abeledDatasetPartitionDataBuilderOnHeap.java | 2 +-
.../preprocessing/LabeledDatasetLoader.java | 2 +-
.../svm/SVMLinearBinaryClassificationModel.java | 9 +-
.../SVMLinearBinaryClassificationTrainer.java | 4 +-
.../SVMLinearMultiClassClassificationModel.java | 5 +
...VMLinearMultiClassClassificationTrainer.java | 4 +-
.../ignite/ml/trainers/DatasetTrainer.java | 26 ++-
.../ml/trainers/MultiLabelDatasetTrainer.java | 2 +-
.../ml/trainers/SingleLabelDatasetTrainer.java | 2 +-
.../org/apache/ignite/ml/tree/DecisionTree.java | 56 +++++-
.../ml/tree/DecisionTreeConditionalNode.java | 10 ++
.../ignite/ml/tree/DecisionTreeLeafNode.java | 10 ++
.../ml/tree/data/DecisionTreeDataBuilder.java | 2 +-
.../org/apache/ignite/ml/util/ModelTrace.java | 130 ++++++++++++++
.../org/apache/ignite/ml/LocalModelsTest.java | 2 +-
.../java/org/apache/ignite/ml/TestUtils.java | 2 +-
.../ignite/ml/clustering/KMeansModelTest.java | 2 +-
.../ignite/ml/clustering/KMeansTrainerTest.java | 2 +-
.../ml/genetic/GAGridCalculateFitnessTest.java | 5 +-
.../genetic/GAGridInitializePopulationTest.java | 5 +-
.../ignite/ml/knn/KNNClassificationTest.java | 2 +-
.../apache/ignite/ml/knn/KNNRegressionTest.java | 2 +-
.../ignite/ml/knn/LabeledDatasetTest.java | 2 +-
.../org/apache/ignite/ml/math/BlasTest.java | 2 +-
.../ignite/ml/math/MathImplLocalTestSuite.java | 8 +-
.../org/apache/ignite/ml/math/TracerTest.java | 2 +-
.../matrix/MatrixBaseStorageTest.java | 1 -
.../matrix/MatrixStorageFixtures.java | 1 -
.../primitives/vector/AbstractVectorTest.java | 2 +-
.../vector/DelegatingVectorConstructorTest.java | 2 +-
.../primitives/vector/MatrixVectorViewTest.java | 2 +-
.../primitives/vector/VectorAttributesTest.java | 2 +-
.../vector/VectorBaseStorageTest.java | 1 -
.../vector/VectorImplementationsFixtures.java | 4 +-
.../vector/VectorImplementationsTest.java | 2 +-
.../primitives/vector/VectorToMatrixTest.java | 4 +-
.../java/org/apache/ignite/ml/nn/MLPTest.java | 4 +-
.../ignite/ml/nn/MLPTrainerIntegrationTest.java | 4 +-
.../org/apache/ignite/ml/nn/MLPTrainerTest.java | 2 +-
.../MLPTrainerMnistIntegrationTest.java | 2 +-
.../ml/nn/performance/MLPTrainerMnistTest.java | 2 +-
.../linear/LinearRegressionModelTest.java | 2 +-
.../logistic/LogisticRegressionModelTest.java | 2 +-
.../ml/svm/SVMBinaryTrainerIntegrationTest.java | 102 +++++++++++
.../org/apache/ignite/ml/svm/SVMModelTest.java | 2 +-
.../org/apache/ignite/ml/svm/SVMTestSuite.java | 3 +-
modules/web-console/backend/middlewares/api.js | 5 +
modules/web-console/backend/routes/admin.js | 4 +-
.../backend/services/notifications.js | 4 +-
modules/web-console/frontend/app/app.js | 7 +-
.../connected-clusters-badge/style.scss | 2 +-
.../page-configure-overview/controller.js | 5 +
.../page-configure-overview/style.scss | 2 +-
.../page-configure-overview/template.pug | 14 +-
.../app/components/page-configure/states.js | 6 -
.../app/components/page-configure/template.pug | 10 +-
.../page-forgot-password/template.pug | 2 +-
.../app/components/page-profile/index.js | 12 +-
.../app/components/page-profile/style.scss | 3 +
.../app/components/page-profile/template.pug | 16 +-
.../components/queries-notebook/style.scss | 47 +++--
.../queries-notebook/template.tpl.pug | 163 +++++++++--------
.../queries-notebooks-list/controller.js | 2 +-
.../app/components/page-queries/index.js | 33 +---
.../app/components/page-signin/template.pug | 2 +-
.../app/components/page-signup/template.pug | 2 +-
.../app/components/ui-grid-hovering/style.scss | 6 +
.../components/user-notifications/service.js | 2 +-
.../components/web-console-footer/template.pug | 2 +-
.../components/web-console-header/style.scss | 7 +-
.../components/web-console-header/template.pug | 4 +-
.../app/modules/agent/AgentManager.service.js | 4 +-
.../agent/components/cluster-login/template.pug | 7 +-
.../app/modules/nodes/nodes-dialog.tpl.pug | 2 +-
.../frontend/app/modules/states/admin.state.js | 12 +-
.../app/modules/states/settings.state.js | 33 ++++
.../frontend/app/primitives/badge/index.scss | 2 +-
.../frontend/app/primitives/btn/index.scss | 5 +
.../frontend/public/stylesheets/style.scss | 73 +++++---
modules/web-console/frontend/views/403.tpl.pug | 2 +-
modules/web-console/frontend/views/404.tpl.pug | 2 +-
modules/web-console/frontend/views/base.pug | 4 +-
modules/web-console/frontend/views/base2.pug | 26 ---
.../frontend/views/includes/header-left.pug | 2 +-
.../frontend/views/includes/header-right.pug | 2 +-
.../frontend/webpack/webpack.common.js | 2 +-
.../discovery/zk/internal/ZookeeperClient.java | 126 +++++++++----
.../zk/internal/ZookeeperDiscoveryImpl.java | 13 +-
.../zk/internal/ZookeeperClientTest.java | 93 ++++++++++
parent/pom.xml | 4 +-
232 files changed, 2358 insertions(+), 654 deletions(-)
----------------------------------------------------------------------
[04/18] ignite git commit: IGNITE-8981: [ML] Parallel optimizations
for BaggingTrainer
Posted by sb...@apache.org.
IGNITE-8981: [ML] Parallel optimizations for BaggingTrainer
this closes #4350
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f5dd09b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f5dd09b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f5dd09b
Branch: refs/heads/ignite-6467-1
Commit: 9f5dd09bc33d96f0a08d1890f9be33b51fef54ff
Parents: 81d04a5
Author: Alexey Platonov <ap...@gmail.com>
Authored: Tue Jul 24 15:45:09 2018 +0300
Committer: Yury Babak <yb...@gridgain.com>
Committed: Tue Jul 24 15:45:10 2018 +0300
----------------------------------------------------------------------
.../OptimizeMakeChangeFitnessFunction.java | 1 -
.../change/OptimizeMakeChangeGAExample.java | 2 -
.../OptimizeMakeChangeTerminateCriteria.java | 2 -
.../genetic/helloworld/HelloWorldGAExample.java | 2 -
.../helloworld/HelloWorldTerminateCriteria.java | 2 -
.../ml/genetic/knapsack/KnapsackGAExample.java | 2 -
.../knapsack/KnapsackTerminateCriteria.java | 1 -
.../ml/genetic/movie/MovieFitnessFunction.java | 1 -
.../ml/genetic/movie/MovieGAExample.java | 2 -
.../genetic/movie/MovieTerminateCriteria.java | 2 -
.../ml/knn/KNNClassificationExample.java | 2 +-
.../examples/ml/knn/KNNRegressionExample.java | 2 +-
.../examples/ml/nn/MLPTrainerExample.java | 2 +-
.../ml/preprocessing/BinarizationExample.java | 2 +-
.../ml/preprocessing/ImputingExample.java | 2 +-
.../ImputingExampleWithMostFrequentValues.java | 2 +-
.../ml/preprocessing/MinMaxScalerExample.java | 2 +-
.../ml/preprocessing/NormalizationExample.java | 2 +-
...ssionLSQRTrainerWithMinMaxScalerExample.java | 2 +-
...gressionMultiClassClassificationExample.java | 2 +-
.../SVMMultiClassClassificationExample.java | 2 +-
.../RandomForestRegressionExample.java | 18 ++-
.../ml/tutorial/Step_1_Read_and_Learn.java | 2 +-
.../examples/ml/tutorial/Step_2_Imputing.java | 2 +-
.../examples/ml/tutorial/Step_3_Categorial.java | 2 +-
.../ml/tutorial/Step_4_Add_age_fare.java | 2 +-
.../examples/ml/tutorial/Step_5_Scaling.java | 2 +-
.../ignite/examples/ml/tutorial/Step_6_KNN.java | 2 +-
.../ml/tutorial/Step_7_Split_train_test.java | 2 +-
.../ignite/examples/ml/tutorial/Step_8_CV.java | 2 +-
.../ml/tutorial/Step_9_Go_to_LogReg.java | 2 +-
.../main/java/org/apache/ignite/ml/Model.java | 7 +
.../ml/clustering/kmeans/KMeansModel.java | 22 +++-
.../ml/clustering/kmeans/KMeansModelFormat.java | 2 +-
.../ml/clustering/kmeans/KMeansTrainer.java | 6 +-
.../ml/composition/BaggingModelTrainer.java | 38 ++++--
.../ml/composition/ModelOnFeaturesSubspace.java | 19 +++
.../ml/composition/ModelsComposition.java | 14 ++
.../boosting/GDBBinaryClassifierTrainer.java | 2 +-
.../boosting/GDBRegressionTrainer.java | 2 +-
.../ml/composition/boosting/GDBTrainer.java | 40 +++---
.../PredictionsAggregator.java | 8 ++
.../WeightedPredictionsAggregator.java | 24 ++++
.../ignite/ml/dataset/DatasetFactory.java | 2 +-
.../builder/data/SimpleDatasetDataBuilder.java | 2 +-
.../data/SimpleLabeledDatasetDataBuilder.java | 2 +-
.../ml/environment/LearningEnvironment.java | 54 ++++++++
.../environment/LearningEnvironmentBuilder.java | 123 ++++++++++++++++++
.../ml/environment/logging/ConsoleLogger.java | 102 +++++++++++++++
.../ml/environment/logging/CustomMLLogger.java | 105 +++++++++++++++
.../ignite/ml/environment/logging/MLLogger.java | 69 ++++++++++
.../ml/environment/logging/NoOpLogger.java | 64 +++++++++
.../ml/environment/logging/package-info.java | 21 +++
.../ignite/ml/environment/package-info.java | 21 +++
.../parallelism/DefaultParallelismStrategy.java | 85 ++++++++++++
.../parallelism/NoParallelismStrategy.java | 87 +++++++++++++
.../parallelism/ParallelismStrategy.java | 47 +++++++
.../ml/environment/parallelism/Promise.java | 53 ++++++++
.../environment/parallelism/package-info.java | 21 +++
.../apache/ignite/ml/genetic/CrossOverJob.java | 4 +-
.../apache/ignite/ml/genetic/CrossOverTask.java | 4 +-
.../apache/ignite/ml/genetic/FitnessJob.java | 4 +-
.../apache/ignite/ml/genetic/FitnessTask.java | 4 +-
.../org/apache/ignite/ml/genetic/GAGrid.java | 3 -
.../java/org/apache/ignite/ml/genetic/Gene.java | 1 -
.../apache/ignite/ml/genetic/MutateTask.java | 5 +-
.../ignite/ml/genetic/TruncateSelectionJob.java | 3 +-
.../ml/genetic/TruncateSelectionTask.java | 4 +-
.../ml/genetic/functions/GAGridFunction.java | 4 +-
.../ml/genetic/parameter/GAConfiguration.java | 1 -
.../ignite/ml/genetic/utils/GAGridUtils.java | 3 -
.../java/org/apache/ignite/ml/knn/KNNUtils.java | 2 +-
.../classification/KNNClassificationModel.java | 17 ++-
.../KNNClassificationTrainer.java | 4 +-
.../ml/knn/regression/KNNRegressionModel.java | 17 ++-
.../ml/knn/regression/KNNRegressionTrainer.java | 4 +-
.../java/org/apache/ignite/ml/math/Blas.java | 2 +-
.../java/org/apache/ignite/ml/math/Tracer.java | 32 ++++-
.../ml/math/distances/DistanceMeasure.java | 2 +-
.../ml/math/distances/EuclideanDistance.java | 2 +-
.../ml/math/distances/HammingDistance.java | 2 +-
.../ml/math/distances/ManhattanDistance.java | 2 +-
.../math/primitives/matrix/AbstractMatrix.java | 2 +-
.../primitives/matrix/impl/DenseMatrix.java | 6 +-
.../primitives/matrix/impl/SparseMatrix.java | 6 +-
.../math/primitives/matrix/impl/ViewMatrix.java | 6 +-
.../matrix/storage/DenseMatrixStorage.java | 2 +-
.../matrix/storage/SparseMatrixStorage.java | 2 +-
.../math/primitives/vector/AbstractVector.java | 2 +-
.../ml/math/primitives/vector/Vector.java | 3 +-
.../vector/impl/DelegatingVector.java | 6 +-
.../primitives/vector/impl/DenseVector.java | 6 +-
.../primitives/vector/impl/SparseVector.java | 4 +-
.../math/primitives/vector/impl/VectorView.java | 4 +-
.../vector/impl/VectorizedViewMatrix.java | 4 +-
.../storage/VectorizedViewMatrixStorage.java | 2 +-
.../apache/ignite/ml/math/util/MatrixUtil.java | 6 +-
.../org/apache/ignite/ml/nn/MLPTrainer.java | 6 +-
.../ignite/ml/nn/MultilayerPerceptron.java | 29 ++++-
.../ignite/ml/nn/ReplicatedVectorMatrix.java | 6 +-
.../ignite/ml/optimization/LossFunctions.java | 2 +-
.../ml/optimization/SmoothParametrized.java | 4 +-
.../NesterovUpdateCalculator.java | 4 +-
.../ParameterUpdateCalculator.java | 4 +-
.../RPropUpdateCalculator.java | 4 +-
.../SimpleGDUpdateCalculator.java | 4 +-
.../binarization/BinarizationPreprocessor.java | 2 +-
.../binarization/BinarizationTrainer.java | 2 +-
.../StringEncoderPreprocessor.java | 4 +-
.../stringencoder/StringEncoderTrainer.java | 2 +-
.../imputing/ImputerPreprocessor.java | 2 +-
.../preprocessing/imputing/ImputerTrainer.java | 2 +-
.../minmaxscaling/MinMaxScalerPreprocessor.java | 2 +-
.../minmaxscaling/MinMaxScalerTrainer.java | 2 +-
.../NormalizationPreprocessor.java | 2 +-
.../normalization/NormalizationTrainer.java | 2 +-
.../linear/FeatureExtractorWrapper.java | 2 +-
.../linear/LinearRegressionLSQRTrainer.java | 6 +-
.../linear/LinearRegressionModel.java | 9 +-
.../linear/LinearRegressionSGDTrainer.java | 4 +-
.../binomial/LogisticRegressionModel.java | 9 +-
.../binomial/LogisticRegressionSGDTrainer.java | 4 +-
.../LogRegressionMultiClassModel.java | 5 +
.../LogRegressionMultiClassTrainer.java | 4 +-
.../ignite/ml/selection/cv/CrossValidation.java | 2 +-
.../cursor/CacheBasedLabelPairCursor.java | 2 +-
.../scoring/cursor/LocalLabelPairCursor.java | 2 +-
.../selection/scoring/evaluator/Evaluator.java | 2 +-
.../ignite/ml/structures/LabeledDataset.java | 2 +-
...abeledDatasetPartitionDataBuilderOnHeap.java | 2 +-
.../preprocessing/LabeledDatasetLoader.java | 2 +-
.../svm/SVMLinearBinaryClassificationModel.java | 9 +-
.../SVMLinearBinaryClassificationTrainer.java | 4 +-
.../SVMLinearMultiClassClassificationModel.java | 5 +
...VMLinearMultiClassClassificationTrainer.java | 4 +-
.../ignite/ml/trainers/DatasetTrainer.java | 26 +++-
.../ml/trainers/MultiLabelDatasetTrainer.java | 2 +-
.../ml/trainers/SingleLabelDatasetTrainer.java | 2 +-
.../org/apache/ignite/ml/tree/DecisionTree.java | 56 +++++++-
.../ml/tree/DecisionTreeConditionalNode.java | 10 ++
.../ignite/ml/tree/DecisionTreeLeafNode.java | 10 ++
.../ml/tree/data/DecisionTreeDataBuilder.java | 2 +-
.../org/apache/ignite/ml/util/ModelTrace.java | 130 +++++++++++++++++++
.../org/apache/ignite/ml/LocalModelsTest.java | 2 +-
.../java/org/apache/ignite/ml/TestUtils.java | 2 +-
.../ignite/ml/clustering/KMeansModelTest.java | 2 +-
.../ignite/ml/clustering/KMeansTrainerTest.java | 2 +-
.../ml/genetic/GAGridCalculateFitnessTest.java | 5 +-
.../genetic/GAGridInitializePopulationTest.java | 5 +-
.../ignite/ml/knn/KNNClassificationTest.java | 2 +-
.../apache/ignite/ml/knn/KNNRegressionTest.java | 2 +-
.../ignite/ml/knn/LabeledDatasetTest.java | 2 +-
.../org/apache/ignite/ml/math/BlasTest.java | 2 +-
.../ignite/ml/math/MathImplLocalTestSuite.java | 8 +-
.../org/apache/ignite/ml/math/TracerTest.java | 2 +-
.../matrix/MatrixBaseStorageTest.java | 1 -
.../matrix/MatrixStorageFixtures.java | 1 -
.../primitives/vector/AbstractVectorTest.java | 2 +-
.../vector/DelegatingVectorConstructorTest.java | 2 +-
.../primitives/vector/MatrixVectorViewTest.java | 2 +-
.../primitives/vector/VectorAttributesTest.java | 2 +-
.../vector/VectorBaseStorageTest.java | 1 -
.../vector/VectorImplementationsFixtures.java | 4 +-
.../vector/VectorImplementationsTest.java | 2 +-
.../primitives/vector/VectorToMatrixTest.java | 4 +-
.../java/org/apache/ignite/ml/nn/MLPTest.java | 4 +-
.../ignite/ml/nn/MLPTrainerIntegrationTest.java | 4 +-
.../org/apache/ignite/ml/nn/MLPTrainerTest.java | 2 +-
.../MLPTrainerMnistIntegrationTest.java | 2 +-
.../ml/nn/performance/MLPTrainerMnistTest.java | 2 +-
.../linear/LinearRegressionModelTest.java | 2 +-
.../logistic/LogisticRegressionModelTest.java | 2 +-
.../org/apache/ignite/ml/svm/SVMModelTest.java | 2 +-
173 files changed, 1517 insertions(+), 266 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeFitnessFunction.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeFitnessFunction.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeFitnessFunction.java
index 88d7037..34626be 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeFitnessFunction.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeFitnessFunction.java
@@ -18,7 +18,6 @@
package org.apache.ignite.examples.ml.genetic.change;
import java.util.List;
-
import org.apache.ignite.ml.genetic.Gene;
import org.apache.ignite.ml.genetic.IFitnessFunction;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeGAExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeGAExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeGAExample.java
index 829fc4e..1e80d6d 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeGAExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeGAExample.java
@@ -19,11 +19,9 @@ package org.apache.ignite.examples.ml.genetic.change;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.Ignition;
-
import org.apache.ignite.ml.genetic.Chromosome;
import org.apache.ignite.ml.genetic.GAGrid;
import org.apache.ignite.ml.genetic.Gene;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java
index bb4a369..2080ac3 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java
@@ -18,10 +18,8 @@
package org.apache.ignite.examples.ml.genetic.change;
import java.util.List;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteLogger;
-
import org.apache.ignite.ml.genetic.Chromosome;
import org.apache.ignite.ml.genetic.Gene;
import org.apache.ignite.ml.genetic.parameter.ITerminateCriteria;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldGAExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldGAExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldGAExample.java
index 9e0eb7a..839471a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldGAExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldGAExample.java
@@ -19,10 +19,8 @@ package org.apache.ignite.examples.ml.genetic.helloworld;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
-
import org.apache.ignite.ml.genetic.Chromosome;
import org.apache.ignite.ml.genetic.GAGrid;
import org.apache.ignite.ml.genetic.Gene;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldTerminateCriteria.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldTerminateCriteria.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldTerminateCriteria.java
index e7ec131..41809d4 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldTerminateCriteria.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldTerminateCriteria.java
@@ -18,10 +18,8 @@
package org.apache.ignite.examples.ml.genetic.helloworld;
import java.util.List;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteLogger;
-
import org.apache.ignite.ml.genetic.Chromosome;
import org.apache.ignite.ml.genetic.Gene;
import org.apache.ignite.ml.genetic.parameter.ITerminateCriteria;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/knapsack/KnapsackGAExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/knapsack/KnapsackGAExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/knapsack/KnapsackGAExample.java
index 21b9c01..7578226 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/knapsack/KnapsackGAExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/knapsack/KnapsackGAExample.java
@@ -19,10 +19,8 @@ package org.apache.ignite.examples.ml.genetic.knapsack;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
-
import org.apache.ignite.ml.genetic.GAGrid;
import org.apache.ignite.ml.genetic.Gene;
import org.apache.ignite.ml.genetic.parameter.GAConfiguration;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/knapsack/KnapsackTerminateCriteria.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/knapsack/KnapsackTerminateCriteria.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/knapsack/KnapsackTerminateCriteria.java
index 76af2bb..487f8a7 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/knapsack/KnapsackTerminateCriteria.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/knapsack/KnapsackTerminateCriteria.java
@@ -18,7 +18,6 @@
package org.apache.ignite.examples.ml.genetic.knapsack;
import java.util.List;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.ml.genetic.Chromosome;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieFitnessFunction.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieFitnessFunction.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieFitnessFunction.java
index b5f52f7..bfd50f0 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieFitnessFunction.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieFitnessFunction.java
@@ -19,7 +19,6 @@ package org.apache.ignite.examples.ml.genetic.movie;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.ignite.ml.genetic.Gene;
import org.apache.ignite.ml.genetic.IFitnessFunction;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieGAExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieGAExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieGAExample.java
index c52238b..a0b368af 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieGAExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieGAExample.java
@@ -20,10 +20,8 @@ package org.apache.ignite.examples.ml.genetic.movie;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
-
import org.apache.ignite.ml.genetic.Chromosome;
import org.apache.ignite.ml.genetic.GAGrid;
import org.apache.ignite.ml.genetic.Gene;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java
index ac56cca..43804b7 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java
@@ -18,10 +18,8 @@
package org.apache.ignite.examples.ml.genetic.movie;
import java.util.List;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteLogger;
-
import org.apache.ignite.ml.genetic.Chromosome;
import org.apache.ignite.ml.genetic.Gene;
import org.apache.ignite.ml.genetic.parameter.ITerminateCriteria;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/knn/KNNClassificationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/knn/KNNClassificationExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/knn/KNNClassificationExample.java
index 85e2bec..d12fc1d 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/knn/KNNClassificationExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/knn/KNNClassificationExample.java
@@ -30,8 +30,8 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.ml.knn.classification.KNNClassificationModel;
import org.apache.ignite.ml.knn.classification.KNNClassificationTrainer;
import org.apache.ignite.ml.knn.classification.KNNStrategy;
-import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.distances.EuclideanDistance;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.thread.IgniteThread;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/knn/KNNRegressionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/knn/KNNRegressionExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/knn/KNNRegressionExample.java
index 597efe4..d1e5055 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/knn/KNNRegressionExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/knn/KNNRegressionExample.java
@@ -31,8 +31,8 @@ import org.apache.ignite.ml.knn.classification.KNNClassificationTrainer;
import org.apache.ignite.ml.knn.classification.KNNStrategy;
import org.apache.ignite.ml.knn.regression.KNNRegressionModel;
import org.apache.ignite.ml.knn.regression.KNNRegressionTrainer;
-import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.distances.ManhattanDistance;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.thread.IgniteThread;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/nn/MLPTrainerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/nn/MLPTrainerExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/nn/MLPTrainerExample.java
index 68d793f..7873b12 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/nn/MLPTrainerExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/nn/MLPTrainerExample.java
@@ -24,8 +24,8 @@ import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.ExampleNodeStartup;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.nn.Activators;
import org.apache.ignite.ml.nn.MLPTrainer;
import org.apache.ignite.ml.nn.MultilayerPerceptron;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/BinarizationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/BinarizationExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/BinarizationExample.java
index 9f2fc8a..4c873d9 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/BinarizationExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/BinarizationExample.java
@@ -26,9 +26,9 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.ml.dataset.model.Person;
import org.apache.ignite.ml.dataset.DatasetFactory;
import org.apache.ignite.ml.dataset.primitive.SimpleDataset;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.preprocessing.binarization.BinarizationTrainer;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/ImputingExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/ImputingExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/ImputingExample.java
index 239e3a7..3ea52d8 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/ImputingExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/ImputingExample.java
@@ -26,9 +26,9 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.ml.dataset.model.Person;
import org.apache.ignite.ml.dataset.DatasetFactory;
import org.apache.ignite.ml.dataset.primitive.SimpleDataset;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/ImputingExampleWithMostFrequentValues.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/ImputingExampleWithMostFrequentValues.java b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/ImputingExampleWithMostFrequentValues.java
index 3348ce0..10344bc 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/ImputingExampleWithMostFrequentValues.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/ImputingExampleWithMostFrequentValues.java
@@ -26,9 +26,9 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.ml.dataset.model.Person;
import org.apache.ignite.ml.dataset.DatasetFactory;
import org.apache.ignite.ml.dataset.primitive.SimpleDataset;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
import org.apache.ignite.ml.preprocessing.imputing.ImputingStrategy;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/MinMaxScalerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/MinMaxScalerExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/MinMaxScalerExample.java
index 37920cf..3f3b0d6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/MinMaxScalerExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/MinMaxScalerExample.java
@@ -26,9 +26,9 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.ml.dataset.model.Person;
import org.apache.ignite.ml.dataset.DatasetFactory;
import org.apache.ignite.ml.dataset.primitive.SimpleDataset;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.preprocessing.minmaxscaling.MinMaxScalerTrainer;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/NormalizationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/NormalizationExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/NormalizationExample.java
index e58154a..b8581d0 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/NormalizationExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/NormalizationExample.java
@@ -26,9 +26,9 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.ml.dataset.model.Person;
import org.apache.ignite.ml.dataset.DatasetFactory;
import org.apache.ignite.ml.dataset.primitive.SimpleDataset;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.preprocessing.normalization.NormalizationTrainer;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/regression/linear/LinearRegressionLSQRTrainerWithMinMaxScalerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/regression/linear/LinearRegressionLSQRTrainerWithMinMaxScalerExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/regression/linear/LinearRegressionLSQRTrainerWithMinMaxScalerExample.java
index fca86b6..03c82ef 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/regression/linear/LinearRegressionLSQRTrainerWithMinMaxScalerExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/regression/linear/LinearRegressionLSQRTrainerWithMinMaxScalerExample.java
@@ -27,9 +27,9 @@ import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.preprocessing.minmaxscaling.MinMaxScalerPreprocessor;
import org.apache.ignite.ml.preprocessing.minmaxscaling.MinMaxScalerTrainer;
import org.apache.ignite.ml.regressions.linear.LinearRegressionLSQRTrainer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/LogRegressionMultiClassClassificationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/LogRegressionMultiClassClassificationExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/LogRegressionMultiClassClassificationExample.java
index 362e9b7..351f1c6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/LogRegressionMultiClassClassificationExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/LogRegressionMultiClassClassificationExample.java
@@ -27,9 +27,9 @@ import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.nn.UpdatesStrategy;
import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDParameterUpdate;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/svm/multiclass/SVMMultiClassClassificationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/svm/multiclass/SVMMultiClassClassificationExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/svm/multiclass/SVMMultiClassClassificationExample.java
index b835a5f..b9e24c0 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/svm/multiclass/SVMMultiClassClassificationExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/svm/multiclass/SVMMultiClassClassificationExample.java
@@ -27,9 +27,9 @@ import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.preprocessing.minmaxscaling.MinMaxScalerTrainer;
import org.apache.ignite.ml.svm.SVMLinearMultiClassClassificationModel;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/tree/randomforest/RandomForestRegressionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/tree/randomforest/RandomForestRegressionExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/tree/randomforest/RandomForestRegressionExample.java
index 4704268..c803354 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/tree/randomforest/RandomForestRegressionExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/tree/randomforest/RandomForestRegressionExample.java
@@ -28,6 +28,10 @@ import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.ml.composition.ModelsComposition;
+import org.apache.ignite.ml.environment.LearningEnvironment;
+import org.apache.ignite.ml.environment.logging.ConsoleLogger;
+import org.apache.ignite.ml.environment.logging.MLLogger;
+import org.apache.ignite.ml.environment.parallelism.ParallelismStrategy;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.tree.randomforest.RandomForestRegressionTrainer;
import org.apache.ignite.ml.tree.randomforest.RandomForestTrainer;
@@ -35,11 +39,12 @@ import org.apache.ignite.thread.IgniteThread;
/**
* Example represents a solution for the task of price predictions for houses in Boston based on RandomForest
- * implementation for regression. It shows an initialization of {@link RandomForestTrainer},
- * +initialization of Ignite Cache, learning step and evaluation of model quality in terms of
- * Mean Squared Error (MSE) and Mean Absolute Error (MAE).
+ * implementation for regression. It shows an initialization of {@link RandomForestTrainer}, +initialization of Ignite
+ * Cache, learning step and evaluation of model quality in terms of Mean Squared Error (MSE) and Mean Absolute Error
+ * (MAE).
*
* Dataset url: https://archive.ics.uci.edu/ml/machine-learning-databases/housing/
+ *
* @see RandomForestRegressionTrainer
*/
public class RandomForestRegressionExample {
@@ -54,10 +59,15 @@ public class RandomForestRegressionExample {
System.out.println(">>> Ignite grid started.");
IgniteThread igniteThread = new IgniteThread(ignite.configuration().getIgniteInstanceName(),
- RandomForestRegressionExample.class.getSimpleName(), () -> {
+ RandomForestRegressionExample.class.getSimpleName(), () -> {
IgniteCache<Integer, double[]> dataCache = getTestCache(ignite);
RandomForestRegressionTrainer trainer = new RandomForestRegressionTrainer(13, 4, 101, 0.3, 2, 0);
+ trainer.setEnvironment(LearningEnvironment.builder()
+ .withParallelismStrategy(ParallelismStrategy.Type.ON_DEFAULT_POOL)
+ .withLoggingFactory(ConsoleLogger.factory(MLLogger.VerboseLevel.LOW))
+ .build()
+ );
ModelsComposition randomForest = trainer.fit(ignite, dataCache,
(k, v) -> VectorUtils.of(Arrays.copyOfRange(v, 0, v.length - 1)),
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_1_Read_and_Learn.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_1_Read_and_Learn.java b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_1_Read_and_Learn.java
index 3910edb..460ca67 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_1_Read_and_Learn.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_1_Read_and_Learn.java
@@ -21,9 +21,9 @@ import java.io.FileNotFoundException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.selection.scoring.evaluator.Evaluator;
import org.apache.ignite.ml.selection.scoring.metric.Accuracy;
import org.apache.ignite.ml.tree.DecisionTreeClassificationTrainer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_2_Imputing.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_2_Imputing.java b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_2_Imputing.java
index 52dc434..8127a51 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_2_Imputing.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_2_Imputing.java
@@ -21,9 +21,9 @@ import java.io.FileNotFoundException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
import org.apache.ignite.ml.selection.scoring.evaluator.Evaluator;
import org.apache.ignite.ml.selection.scoring.metric.Accuracy;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_3_Categorial.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_3_Categorial.java b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_3_Categorial.java
index 7eb3d3b..ee2ef8b 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_3_Categorial.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_3_Categorial.java
@@ -21,8 +21,8 @@ import java.io.FileNotFoundException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.preprocessing.encoding.stringencoder.StringEncoderTrainer;
import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
import org.apache.ignite.ml.selection.scoring.evaluator.Evaluator;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_4_Add_age_fare.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_4_Add_age_fare.java b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_4_Add_age_fare.java
index 67615dd..c3bf389 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_4_Add_age_fare.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_4_Add_age_fare.java
@@ -21,8 +21,8 @@ import java.io.FileNotFoundException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.preprocessing.encoding.stringencoder.StringEncoderTrainer;
import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
import org.apache.ignite.ml.selection.scoring.evaluator.Evaluator;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_5_Scaling.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_5_Scaling.java b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_5_Scaling.java
index 88a38ef..549ab77 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_5_Scaling.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_5_Scaling.java
@@ -21,8 +21,8 @@ import java.io.FileNotFoundException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.preprocessing.encoding.stringencoder.StringEncoderTrainer;
import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
import org.apache.ignite.ml.preprocessing.minmaxscaling.MinMaxScalerTrainer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_6_KNN.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_6_KNN.java b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_6_KNN.java
index 42a531b..5308287 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_6_KNN.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_6_KNN.java
@@ -24,8 +24,8 @@ import org.apache.ignite.Ignition;
import org.apache.ignite.ml.knn.classification.KNNClassificationModel;
import org.apache.ignite.ml.knn.classification.KNNClassificationTrainer;
import org.apache.ignite.ml.knn.classification.KNNStrategy;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.preprocessing.encoding.stringencoder.StringEncoderTrainer;
import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
import org.apache.ignite.ml.preprocessing.minmaxscaling.MinMaxScalerTrainer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_7_Split_train_test.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_7_Split_train_test.java b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_7_Split_train_test.java
index 3a882e0..c8fad61 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_7_Split_train_test.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_7_Split_train_test.java
@@ -21,8 +21,8 @@ import java.io.FileNotFoundException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.preprocessing.encoding.stringencoder.StringEncoderTrainer;
import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
import org.apache.ignite.ml.preprocessing.minmaxscaling.MinMaxScalerTrainer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_8_CV.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_8_CV.java b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_8_CV.java
index 077d8c8..981e119 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_8_CV.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_8_CV.java
@@ -22,8 +22,8 @@ import java.util.Arrays;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.preprocessing.encoding.stringencoder.StringEncoderTrainer;
import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
import org.apache.ignite.ml.preprocessing.minmaxscaling.MinMaxScalerTrainer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_9_Go_to_LogReg.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_9_Go_to_LogReg.java b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_9_Go_to_LogReg.java
index 701039a..88b642b 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_9_Go_to_LogReg.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_9_Go_to_LogReg.java
@@ -22,8 +22,8 @@ import java.util.Arrays;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.nn.UpdatesStrategy;
import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDParameterUpdate;
import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDUpdateCalculator;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/Model.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/Model.java b/modules/ml/src/main/java/org/apache/ignite/ml/Model.java
index 41b10b9..a042666 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/Model.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/Model.java
@@ -32,4 +32,11 @@ public interface Model<T, V> extends IgniteFunction<T, V> {
public default <X, W> Model<T, X> combine(Model<T, W> other, BiFunction<V, W, X> combiner) {
return v -> combiner.apply(apply(v), other.apply(v));
}
+
+ /**
+ * @param pretty Use pretty mode.
+ */
+ default public String toString(boolean pretty) {
+ return getClass().getSimpleName();
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModel.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModel.java
index 6c09f9d..bdfa1b6 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModel.java
@@ -18,10 +18,14 @@
package org.apache.ignite.ml.clustering.kmeans;
import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
import org.apache.ignite.ml.Exportable;
import org.apache.ignite.ml.Exporter;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
+import org.apache.ignite.ml.math.Tracer;
import org.apache.ignite.ml.math.distances.DistanceMeasure;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
+import org.apache.ignite.ml.util.ModelTrace;
/**
* This class encapsulates result of clusterization by KMeans algorithm.
@@ -109,4 +113,20 @@ public class KMeansModel implements ClusterizationModel<Vector, Integer>, Export
return distanceMeasure.equals(that.distanceMeasure) && Arrays.deepEquals(centers, that.centers);
}
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return toString(false);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ String measureName = distanceMeasure.getClass().getSimpleName();
+ List<String> centersList = Arrays.stream(centers).map(x -> Tracer.asAscii(x, "%.4f", false))
+ .collect(Collectors.toList());
+
+ return ModelTrace.builder("KMeansModel", pretty)
+ .addField("distance measure", measureName)
+ .addField("centroids", centersList)
+ .toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModelFormat.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModelFormat.java b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModelFormat.java
index a0f6cc7..549b9fe 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModelFormat.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModelFormat.java
@@ -21,8 +21,8 @@ import java.io.Serializable;
import java.util.Arrays;
import org.apache.ignite.ml.Exportable;
import org.apache.ignite.ml.Exporter;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.distances.DistanceMeasure;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* K-means model representation.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansTrainer.java
index b26ff68..7dbc78a 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansTrainer.java
@@ -28,11 +28,11 @@ import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.PartitionDataBuilder;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
-import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.distances.DistanceMeasure;
import org.apache.ignite.ml.math.distances.EuclideanDistance;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.util.MapUtil;
import org.apache.ignite.ml.structures.LabeledDataset;
@@ -43,7 +43,7 @@ import org.apache.ignite.ml.trainers.SingleLabelDatasetTrainer;
/**
* The trainer for KMeans algorithm.
*/
-public class KMeansTrainer implements SingleLabelDatasetTrainer<KMeansModel> {
+public class KMeansTrainer extends SingleLabelDatasetTrainer<KMeansModel> {
/** Amount of clusters. */
private int k = 2;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/composition/BaggingModelTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/BaggingModelTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/BaggingModelTrainer.java
index d73bd4e..f439789 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/BaggingModelTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/BaggingModelTrainer.java
@@ -22,25 +22,28 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
+import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.ignite.ml.Model;
import org.apache.ignite.ml.composition.predictionsaggregator.PredictionsAggregator;
import org.apache.ignite.ml.dataset.DatasetBuilder;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
-import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
+import org.apache.ignite.ml.environment.logging.MLLogger;
+import org.apache.ignite.ml.environment.parallelism.Promise;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
+import org.apache.ignite.ml.math.functions.IgniteSupplier;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.selection.split.mapper.SHA256UniformMapper;
import org.apache.ignite.ml.trainers.DatasetTrainer;
import org.apache.ignite.ml.util.Utils;
import org.jetbrains.annotations.NotNull;
/**
- * Abstract trainer implementing bagging logic.
- * In each learning iteration the algorithm trains one model on subset of learning sample and
- * subspace of features space. Each model is produced from same model-class [e.g. Decision Trees].
+ * Abstract trainer implementing bagging logic. In each learning iteration the algorithm trains one model on subset of
+ * learning sample and subspace of features space. Each model is produced from same model-class [e.g. Decision Trees].
*/
-public abstract class BaggingModelTrainer implements DatasetTrainer<ModelsComposition, Double> {
+public abstract class BaggingModelTrainer extends DatasetTrainer<ModelsComposition, Double> {
/**
* Predictions aggregator.
*/
@@ -89,11 +92,23 @@ public abstract class BaggingModelTrainer implements DatasetTrainer<ModelsCompos
IgniteBiFunction<K, V, Vector> featureExtractor,
IgniteBiFunction<K, V, Double> lbExtractor) {
- List<ModelOnFeaturesSubspace> learnedModels = new ArrayList<>();
- for (int i = 0; i < ensembleSize; i++)
- learnedModels.add(learnModel(datasetBuilder, featureExtractor, lbExtractor));
+ MLLogger log = environment.logger(getClass());
+ log.log(MLLogger.VerboseLevel.LOW, "Start learning");
+
+ Long startTs = System.currentTimeMillis();
+
+ List<IgniteSupplier<ModelOnFeaturesSubspace>> tasks = new ArrayList<>();
+ for(int i = 0; i < ensembleSize; i++)
+ tasks.add(() -> learnModel(datasetBuilder, featureExtractor, lbExtractor));
+
+ List<Model<Vector, Double>> models = environment.parallelismStrategy().submit(tasks)
+ .stream().map(Promise::unsafeGet)
+ .collect(Collectors.toList());
- return new ModelsComposition(learnedModels, predictionsAggregator);
+ double learningTime = (double)(System.currentTimeMillis() - startTs) / 1000.0;
+ log.log(MLLogger.VerboseLevel.LOW, "The training time was %.2fs", learningTime);
+ log.log(MLLogger.VerboseLevel.LOW, "Learning finished");
+ return new ModelsComposition(models, predictionsAggregator);
}
/**
@@ -114,10 +129,13 @@ public abstract class BaggingModelTrainer implements DatasetTrainer<ModelsCompos
Map<Integer, Integer> featuresMapping = createFeaturesMapping(featureExtractorSeed, featureVectorSize);
//TODO: IGNITE-8867 Need to implement bootstrapping algorithm
+ Long startTs = System.currentTimeMillis();
Model<Vector, Double> mdl = buildDatasetTrainerForModel().fit(
datasetBuilder.withFilter((features, answer) -> sampleFilter.map(features, answer) < samplePartSizePerMdl),
wrapFeatureExtractor(featureExtractor, featuresMapping),
lbExtractor);
+ double learningTime = (double)(System.currentTimeMillis() - startTs) / 1000.0;
+ environment.logger(getClass()).log(MLLogger.VerboseLevel.HIGH, "One model training time was %.2fs", learningTime);
return new ModelOnFeaturesSubspace(featuresMapping, mdl);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelOnFeaturesSubspace.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelOnFeaturesSubspace.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelOnFeaturesSubspace.java
index 5877afa..5ef1de5 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelOnFeaturesSubspace.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelOnFeaturesSubspace.java
@@ -19,9 +19,11 @@ package org.apache.ignite.ml.composition;
import java.util.Collections;
import java.util.Map;
+import java.util.stream.Collectors;
import org.apache.ignite.ml.Model;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
+import org.apache.ignite.ml.util.ModelTrace;
/**
* Model trained on a features subspace with mapping from original features space to subspace.
@@ -72,4 +74,21 @@ public class ModelOnFeaturesSubspace implements Model<Vector, Double> {
public Model<Vector, Double> getMdl() {
return mdl;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return toString(false);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ String mappingStr = featuresMapping.entrySet().stream()
+ .map(e -> String.format("%d -> %d", e.getKey(), e.getValue()))
+ .collect(Collectors.joining(", ", "{", "}"));
+
+ return ModelTrace.builder("ModelOnFeatureSubspace", pretty)
+ .addField("features mapping", mappingStr)
+ .addField("model", mdl.toString(false))
+ .toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelsComposition.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelsComposition.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelsComposition.java
index 661c941..e14fa6d 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelsComposition.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelsComposition.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.ignite.ml.Model;
import org.apache.ignite.ml.composition.predictionsaggregator.PredictionsAggregator;
import org.apache.ignite.ml.math.primitives.vector.Vector;
+import org.apache.ignite.ml.util.ModelTrace;
/**
* Model consisting of several models and prediction aggregation strategy.
@@ -75,4 +76,17 @@ public class ModelsComposition implements Model<Vector, Double> {
public List<Model<Vector, Double>> getModels() {
return models;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return toString(false);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ return ModelTrace.builder("Models composition", pretty)
+ .addField("aggregator", predictionsAggregator.toString(pretty))
+ .addField("models", models)
+ .toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBBinaryClassifierTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBBinaryClassifierTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBBinaryClassifierTrainer.java
index 25ae2375..53a6219 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBBinaryClassifierTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBBinaryClassifierTrainer.java
@@ -25,10 +25,10 @@ import java.util.stream.Collectors;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.primitive.builder.context.EmptyContextBuilder;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
import org.apache.ignite.ml.math.functions.IgniteTriFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.structures.LabeledDataset;
import org.apache.ignite.ml.structures.LabeledVector;
import org.apache.ignite.ml.structures.partition.LabeledDatasetPartitionDataBuilderOnHeap;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBRegressionTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBRegressionTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBRegressionTrainer.java
index 2c8caba..201586e 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBRegressionTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBRegressionTrainer.java
@@ -18,8 +18,8 @@
package org.apache.ignite.ml.composition.boosting;
import org.apache.ignite.ml.dataset.DatasetBuilder;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Trainer for regressor using Gradient Boosting.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBTrainer.java
index 8bdb9b8..6726892 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBTrainer.java
@@ -28,10 +28,11 @@ import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.primitive.builder.context.EmptyContextBuilder;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
+import org.apache.ignite.ml.environment.logging.MLLogger;
import org.apache.ignite.ml.knn.regression.KNNRegressionTrainer;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.functions.IgniteTriFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.regressions.linear.LinearRegressionLSQRTrainer;
import org.apache.ignite.ml.regressions.linear.LinearRegressionSGDTrainer;
import org.apache.ignite.ml.trainers.DatasetTrainer;
@@ -42,26 +43,25 @@ import org.apache.ignite.ml.tree.randomforest.RandomForestRegressionTrainer;
import org.jetbrains.annotations.NotNull;
/**
- * Abstract Gradient Boosting trainer.
- * It implements gradient descent in functional space using user-selected regressor in child class.
- * Each learning iteration the trainer evaluate gradient of error-function and fit regression model
- * to it. After learning step the model is used in models composition of regressions with weight
- * equal to gradient descent step.
+ * Abstract Gradient Boosting trainer. It implements gradient descent in functional space using user-selected regressor
+ * in child class. Each learning iteration the trainer evaluate gradient of error-function and fit regression model to
+ * it. After learning step the model is used in models composition of regressions with weight equal to gradient descent
+ * step.
*
- * These classes can be used as regressor trainers:
- * {@link DecisionTreeRegressionTrainer}, {@link KNNRegressionTrainer},
- * {@link LinearRegressionLSQRTrainer}, {@link RandomForestRegressionTrainer},
- * {@link LinearRegressionSGDTrainer}.
+ * These classes can be used as regressor trainers: {@link DecisionTreeRegressionTrainer}, {@link KNNRegressionTrainer},
+ * {@link LinearRegressionLSQRTrainer}, {@link RandomForestRegressionTrainer}, {@link LinearRegressionSGDTrainer}.
*
* But in practice Decision Trees is most used regressors (see: {@link DecisionTreeRegressionTrainer}).
*/
-abstract class GDBTrainer implements DatasetTrainer<Model<Vector, Double>, Double> {
+abstract class GDBTrainer extends DatasetTrainer<Model<Vector, Double>, Double> {
/** Gradient step. */
private final double gradientStep;
/** Count of iterations. */
private final int cntOfIterations;
- /** Gradient of loss function. First argument is sample size, second argument is valid answer,
- * third argument is current model prediction. */
+ /**
+ * Gradient of loss function. First argument is sample size, second argument is valid answer, third argument is
+ * current model prediction.
+ */
private final IgniteTriFunction<Long, Double, Double, Double> lossGradient;
/**
@@ -69,9 +69,11 @@ abstract class GDBTrainer implements DatasetTrainer<Model<Vector, Double>, Doubl
*
* @param gradStepSize Grad step size.
* @param cntOfIterations Count of learning iterations.
- * @param lossGradient Gradient of loss function. First argument is sample size, second argument is valid answer third argument is current model prediction.
+ * @param lossGradient Gradient of loss function. First argument is sample size, second argument is valid answer
+ * third argument is current model prediction.
*/
- public GDBTrainer(double gradStepSize, Integer cntOfIterations, IgniteTriFunction<Long, Double, Double, Double> lossGradient) {
+ public GDBTrainer(double gradStepSize, Integer cntOfIterations,
+ IgniteTriFunction<Long, Double, Double, Double> lossGradient) {
gradientStep = gradStepSize;
this.cntOfIterations = cntOfIterations;
this.lossGradient = lossGradient;
@@ -94,6 +96,7 @@ abstract class GDBTrainer implements DatasetTrainer<Model<Vector, Double>, Doubl
Arrays.fill(compositionWeights, gradientStep);
WeightedPredictionsAggregator resAggregator = new WeightedPredictionsAggregator(compositionWeights, mean);
+ long learningStartTs = System.currentTimeMillis();
for (int i = 0; i < cntOfIterations; i++) {
double[] weights = Arrays.copyOf(compositionWeights, i);
WeightedPredictionsAggregator aggregator = new WeightedPredictionsAggregator(weights, mean);
@@ -105,8 +108,13 @@ abstract class GDBTrainer implements DatasetTrainer<Model<Vector, Double>, Doubl
return -lossGradient.apply(sampleSize, realAnswer, mdlAnswer);
};
+ long startTs = System.currentTimeMillis();
models.add(buildBaseModelTrainer().fit(datasetBuilder, featureExtractor, lbExtractorWrap));
+ double learningTime = (double)(System.currentTimeMillis() - startTs) / 1000.0;
+ environment.logger(getClass()).log(MLLogger.VerboseLevel.LOW, "One model training time was %.2fs", learningTime);
}
+ double learningTime = (double)(System.currentTimeMillis() - learningStartTs) / 1000.0;
+ environment.logger(getClass()).log(MLLogger.VerboseLevel.LOW, "The training time was %.2fs", learningTime);
return new ModelsComposition(models, resAggregator) {
@Override public Double apply(Vector features) {
@@ -122,7 +130,7 @@ abstract class GDBTrainer implements DatasetTrainer<Model<Vector, Double>, Doubl
* @param featureExtractor Feature extractor.
* @param lExtractor Labels extractor.
*/
- protected abstract <V, K> void learnLabels(DatasetBuilder<K, V> builder,
+ protected abstract <V, K> void learnLabels(DatasetBuilder<K, V> builder,
IgniteBiFunction<K, V, Vector> featureExtractor, IgniteBiFunction<K, V, Double> lExtractor);
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/PredictionsAggregator.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/PredictionsAggregator.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/PredictionsAggregator.java
index 86b1e96..d996a2a 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/PredictionsAggregator.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/PredictionsAggregator.java
@@ -23,4 +23,12 @@ import org.apache.ignite.ml.math.functions.IgniteFunction;
* Predictions aggregator interface.
*/
public interface PredictionsAggregator extends IgniteFunction<double[], Double> {
+ /**
+ * Represents aggregator as String.
+ *
+ * @param pretty Use pretty mode.
+ */
+ public default String toString(boolean pretty) {
+ return getClass().getSimpleName();
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregator.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregator.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregator.java
index f6bbe9c..c37fdf7 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregator.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregator.java
@@ -62,4 +62,28 @@ public class WeightedPredictionsAggregator implements PredictionsAggregator {
return res;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return toString(false);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ String clsName = getClass().getSimpleName();
+ if(!pretty)
+ return clsName;
+
+ StringBuilder builder = new StringBuilder(clsName).append(" [");
+ for(int i = 0; i < weights.length; i++) {
+ final String SIGN = weights[i] > 0 ? " + " : " - ";
+ builder
+ .append(i > 0 || weights[i] < 0 ? SIGN : "")
+ .append(String.format("%.4f", Math.abs(weights[i])))
+ .append("*x").append(i);
+ }
+
+ return builder.append(bias > 0 ? " + " : " - ").append(String.format("%.4f", bias))
+ .append("]").toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/DatasetFactory.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/DatasetFactory.java b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/DatasetFactory.java
index 75ac6d3..ffd3136 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/DatasetFactory.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/DatasetFactory.java
@@ -31,8 +31,8 @@ import org.apache.ignite.ml.dataset.primitive.builder.data.SimpleLabeledDatasetD
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
import org.apache.ignite.ml.dataset.primitive.data.SimpleDatasetData;
import org.apache.ignite.ml.dataset.primitive.data.SimpleLabeledDatasetData;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Factory providing a client facing API that allows to construct basic and the most frequently used types of dataset.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/primitive/builder/data/SimpleDatasetDataBuilder.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/primitive/builder/data/SimpleDatasetDataBuilder.java b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/primitive/builder/data/SimpleDatasetDataBuilder.java
index e2f98c2..cf5bc7a 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/primitive/builder/data/SimpleDatasetDataBuilder.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/primitive/builder/data/SimpleDatasetDataBuilder.java
@@ -22,8 +22,8 @@ import java.util.Iterator;
import org.apache.ignite.ml.dataset.PartitionDataBuilder;
import org.apache.ignite.ml.dataset.UpstreamEntry;
import org.apache.ignite.ml.dataset.primitive.data.SimpleDatasetData;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* A partition {@code data} builder that makes {@link SimpleDatasetData}.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/primitive/builder/data/SimpleLabeledDatasetDataBuilder.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/primitive/builder/data/SimpleLabeledDatasetDataBuilder.java b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/primitive/builder/data/SimpleLabeledDatasetDataBuilder.java
index 1bfd949..6286255 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/primitive/builder/data/SimpleLabeledDatasetDataBuilder.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/primitive/builder/data/SimpleLabeledDatasetDataBuilder.java
@@ -22,8 +22,8 @@ import java.util.Iterator;
import org.apache.ignite.ml.dataset.PartitionDataBuilder;
import org.apache.ignite.ml.dataset.UpstreamEntry;
import org.apache.ignite.ml.dataset.primitive.data.SimpleLabeledDatasetData;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* A partition {@code data} builder that makes {@link SimpleLabeledDatasetData}.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/LearningEnvironment.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/LearningEnvironment.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/LearningEnvironment.java
new file mode 100644
index 0000000..2b94a2f
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/LearningEnvironment.java
@@ -0,0 +1,54 @@
+/*
+ * 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.ml.environment;
+
+import org.apache.ignite.ml.environment.logging.MLLogger;
+import org.apache.ignite.ml.environment.parallelism.ParallelismStrategy;
+
+/**
+ * Specifies a set of utility-objects helpful at runtime but optional for learning algorithm
+ * (like thread pool for parallel learning in bagging model or logger).
+ */
+public interface LearningEnvironment {
+ /** Default environment */
+ public static final LearningEnvironment DEFAULT = builder().build();
+
+ /**
+ * Returns Parallelism Strategy instance.
+ */
+ public ParallelismStrategy parallelismStrategy();
+
+ /**
+ * Returns an instance of logger.
+ */
+ public MLLogger logger();
+
+ /**
+ * Returns an instance of logger for specific class.
+ *
+ * @param forClass Logging class context.
+ */
+ public <T> MLLogger logger(Class<T> forClass);
+
+ /**
+ * Creates an instance of LearningEnvironmentBuilder.
+ */
+ public static LearningEnvironmentBuilder builder() {
+ return new LearningEnvironmentBuilder();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/LearningEnvironmentBuilder.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/LearningEnvironmentBuilder.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/LearningEnvironmentBuilder.java
new file mode 100644
index 0000000..be56ccc
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/LearningEnvironmentBuilder.java
@@ -0,0 +1,123 @@
+/*
+ * 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.ml.environment;
+
+import org.apache.ignite.ml.environment.logging.MLLogger;
+import org.apache.ignite.ml.environment.logging.NoOpLogger;
+import org.apache.ignite.ml.environment.parallelism.DefaultParallelismStrategy;
+import org.apache.ignite.ml.environment.parallelism.NoParallelismStrategy;
+import org.apache.ignite.ml.environment.parallelism.ParallelismStrategy;
+
+/**
+ * Builder for LearningEnvironment.
+ */
+public class LearningEnvironmentBuilder {
+ /** Parallelism strategy. */
+ private ParallelismStrategy parallelismStgy;
+ /** Logging factory. */
+ private MLLogger.Factory loggingFactory;
+
+ /**
+ * Creates an instance of LearningEnvironmentBuilder.
+ */
+ LearningEnvironmentBuilder() {
+ parallelismStgy = NoParallelismStrategy.INSTANCE;
+ loggingFactory = NoOpLogger.factory();
+ }
+
+ /**
+ * Specifies Parallelism Strategy for LearningEnvironment.
+ *
+ * @param stgy Parallelism Strategy.
+ */
+ public <T> LearningEnvironmentBuilder withParallelismStrategy(ParallelismStrategy stgy) {
+ this.parallelismStgy = stgy;
+
+ return this;
+ }
+
+ /**
+ * Specifies Parallelism Strategy for LearningEnvironment.
+ *
+ * @param stgyType Parallelism Strategy Type.
+ */
+ public LearningEnvironmentBuilder withParallelismStrategy(ParallelismStrategy.Type stgyType) {
+ switch (stgyType) {
+ case NO_PARALLELISM:
+ this.parallelismStgy = NoParallelismStrategy.INSTANCE;
+ case ON_DEFAULT_POOL:
+ this.parallelismStgy = new DefaultParallelismStrategy();
+ }
+ return this;
+ }
+
+
+ /**
+ * Specifies Logging factory for LearningEnvironment.
+ *
+ * @param loggingFactory Logging Factory.
+ */
+ public LearningEnvironmentBuilder withLoggingFactory(MLLogger.Factory loggingFactory) {
+ this.loggingFactory = loggingFactory;
+ return this;
+ }
+
+ /**
+ * Create an instance of LearningEnvironment.
+ */
+ public LearningEnvironment build() {
+ return new LearningEnvironmentImpl(parallelismStgy, loggingFactory);
+ }
+
+ /**
+ * Default LearningEnvironment implementation.
+ */
+ private class LearningEnvironmentImpl implements LearningEnvironment {
+ /** Parallelism strategy. */
+ private final ParallelismStrategy parallelismStgy;
+ /** Logging factory. */
+ private final MLLogger.Factory loggingFactory;
+
+ /**
+ * Creates an instance of LearningEnvironmentImpl.
+ *
+ * @param parallelismStgy Parallelism strategy.
+ * @param loggingFactory Logging factory.
+ */
+ private LearningEnvironmentImpl(ParallelismStrategy parallelismStgy,
+ MLLogger.Factory loggingFactory) {
+ this.parallelismStgy = parallelismStgy;
+ this.loggingFactory = loggingFactory;
+ }
+
+ /** {@inheritDoc} */
+ @Override public ParallelismStrategy parallelismStrategy() {
+ return parallelismStgy;
+ }
+
+ /** {@inheritDoc} */
+ @Override public MLLogger logger() {
+ return loggingFactory.create(getClass());
+ }
+
+ /** {@inheritDoc} */
+ @Override public <T> MLLogger logger(Class<T> clazz) {
+ return loggingFactory.create(clazz);
+ }
+ }
+}
[03/18] ignite git commit: IGNITE-8981: [ML] Parallel optimizations
for BaggingTrainer
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/ConsoleLogger.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/ConsoleLogger.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/ConsoleLogger.java
new file mode 100644
index 0000000..7efa29c
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/ConsoleLogger.java
@@ -0,0 +1,102 @@
+/*
+ * 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.ml.environment.logging;
+
+import org.apache.ignite.ml.Model;
+import org.apache.ignite.ml.math.Tracer;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
+
+/**
+ * Simple logger printing to STD-out.
+ */
+public class ConsoleLogger implements MLLogger {
+ /** Maximum Verbose level. */
+ private final VerboseLevel maxVerboseLevel;
+ /** Class name. */
+ private final String className;
+
+ /**
+ * Creates an instance of ConsoleLogger.
+ *
+ * @param maxVerboseLevel Max verbose level.
+ * @param clsName Class name.
+ */
+ private ConsoleLogger(VerboseLevel maxVerboseLevel, String clsName) {
+ this.className = clsName;
+ this.maxVerboseLevel = maxVerboseLevel;
+ }
+
+ /**
+ * Returns an instance of ConsoleLogger factory.
+ *
+ * @param maxVerboseLevel Max verbose level.
+ */
+ public static Factory factory(VerboseLevel maxVerboseLevel) {
+ return new Factory(maxVerboseLevel);
+ }
+
+ /** {@inheritDoc} */
+ @Override public Vector log(Vector vector) {
+ Tracer.showAscii(vector);
+ return vector;
+ }
+
+ /** {@inheritDoc} */
+ @Override public <K, V> Model<K, V> log(VerboseLevel verboseLevel, Model<K, V> mdl) {
+ print(verboseLevel, mdl.toString(true));
+ return mdl;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void log(VerboseLevel verboseLevel, String fmtStr, Object... params) {
+ print(verboseLevel, String.format(fmtStr, params));
+ }
+
+ /**
+ * Prints log line to STD-out.
+ *
+ * @param verboseLevel Verbose level.
+ * @param line Line.
+ */
+ private void print(VerboseLevel verboseLevel, String line) {
+ if (this.maxVerboseLevel.compareTo(verboseLevel) >= 0)
+ System.out.println(String.format("%s [%s] %s", className, verboseLevel.name(), line));
+ }
+
+ /**
+ * ConsoleLogger factory.
+ */
+ private static class Factory implements MLLogger.Factory {
+ /** Max Verbose level. */
+ private final VerboseLevel maxVerboseLevel;
+
+ /**
+ * Creates an instance of ConsoleLogger factory.
+ *
+ * @param maxVerboseLevel Max verbose level.
+ */
+ private Factory(VerboseLevel maxVerboseLevel) {
+ this.maxVerboseLevel = maxVerboseLevel;
+ }
+
+ /** {@inheritDoc} */
+ @Override public <T> MLLogger create(Class<T> targetCls) {
+ return new ConsoleLogger(maxVerboseLevel, targetCls.getName());
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/CustomMLLogger.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/CustomMLLogger.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/CustomMLLogger.java
new file mode 100644
index 0000000..65bc4cb
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/CustomMLLogger.java
@@ -0,0 +1,105 @@
+/*
+ * 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.ml.environment.logging;
+
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.ml.Model;
+import org.apache.ignite.ml.math.Tracer;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
+
+/**
+ * MLLogger implementation based on IgniteLogger.
+ */
+public class CustomMLLogger implements MLLogger {
+ /** Ignite logger instance. */
+ private final IgniteLogger logger;
+
+ /**
+ * Creates an instance of CustomMLLogger.
+ *
+ * @param logger Basic Logger.
+ */
+ private CustomMLLogger(IgniteLogger logger) {
+ this.logger = logger;
+ }
+
+ /**
+ * Returns factory for OnIgniteLogger instantiating.
+ *
+ * @param rootLogger Root logger.
+ */
+ public static Factory factory(IgniteLogger rootLogger) {
+ return new Factory(rootLogger);
+ }
+
+ /** {@inheritDoc} */
+ @Override public Vector log(Vector vector) {
+ Tracer.showAscii(vector, logger);
+ return vector;
+ }
+
+ /** {@inheritDoc} */
+ @Override public <K, V> Model<K, V> log(VerboseLevel verboseLevel, Model<K, V> mdl) {
+ log(verboseLevel, mdl.toString(true));
+ return mdl;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void log(VerboseLevel verboseLevel, String fmtStr, Object... params) {
+ log(verboseLevel, String.format(fmtStr, params));
+ }
+
+ /**
+ * Log line.
+ *
+ * @param verboseLevel Verbose level.
+ * @param line Line.
+ */
+ private void log(VerboseLevel verboseLevel, String line) {
+ switch (verboseLevel) {
+ case LOW:
+ logger.info(line);
+ break;
+ case HIGH:
+ logger.debug(line);
+ break;
+ }
+ }
+
+ /**
+ * CustomMLLogger factory.
+ */
+ private static class Factory implements MLLogger.Factory {
+ /** Root logger. */
+ private IgniteLogger rootLogger;
+
+ /**
+ * Creates an instance of factory.
+ *
+ * @param rootLogger Root logger.
+ */
+ public Factory(IgniteLogger rootLogger) {
+ this.rootLogger = rootLogger;
+ }
+
+ /** {@inheritDoc} */
+ @Override public <T> MLLogger create(Class<T> targetCls) {
+ return new CustomMLLogger(rootLogger.getLogger(targetCls));
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/MLLogger.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/MLLogger.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/MLLogger.java
new file mode 100644
index 0000000..872b947
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/MLLogger.java
@@ -0,0 +1,69 @@
+/*
+ * 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.ml.environment.logging;
+
+import org.apache.ignite.ml.Model;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
+
+/**
+ * Helper for ML-specific objects logging.
+ */
+public interface MLLogger {
+ /**
+ * Logging verbose level.
+ */
+ enum VerboseLevel {
+ OFF, LOW, HIGH
+ }
+
+ /**
+ * Log vector.
+ *
+ * @param vector Vector.
+ */
+ public Vector log(Vector vector);
+
+ /**
+ * Log model according to toString method.
+ *
+ * @param verboseLevel Verbose level.
+ * @param mdl Model.
+ */
+ public <K, V> Model<K,V> log(VerboseLevel verboseLevel, Model<K, V> mdl);
+
+ /**
+ * Log line with formatting.
+ *
+ * @param verboseLevel Verbose level.
+ * @param fmtStr Format string.
+ * @param params Params.
+ */
+ public void log(VerboseLevel verboseLevel, String fmtStr, Object... params);
+
+ /**
+ * MLLogger factory interface.
+ */
+ public static interface Factory {
+ /**
+ * Creates an instance of MLLogger for target class.
+ *
+ * @param targetCls For class.
+ */
+ public <T> MLLogger create(Class<T> targetCls);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/NoOpLogger.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/NoOpLogger.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/NoOpLogger.java
new file mode 100644
index 0000000..67b48f5
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/NoOpLogger.java
@@ -0,0 +1,64 @@
+/*
+ * 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.ml.environment.logging;
+
+import org.apache.ignite.ml.Model;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
+
+/**
+ * MLLogger implementation skipping all logs.
+ */
+public class NoOpLogger implements MLLogger {
+ /** Factory. */
+ private static final Factory FACTORY = new Factory();
+
+ /**
+ * Returns NoOpLogger factory.
+ */
+ public static Factory factory() {
+ return FACTORY;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Vector log(Vector vector) {
+ return vector;
+ }
+
+ /** {@inheritDoc} */
+ @Override public <K, V> Model<K, V> log(VerboseLevel verboseLevel, Model<K, V> mdl) {
+ return mdl;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void log(VerboseLevel verboseLevel, String fmtStr, Object... params) {
+
+ }
+
+ /**
+ * NoOpLogger factory.
+ */
+ private static class Factory implements MLLogger.Factory {
+ /** NoOpLogger instance. */
+ private final static NoOpLogger NO_OP_LOGGER = new NoOpLogger();
+
+ /** {@inheritDoc} */
+ @Override public <T> MLLogger create(Class<T> targetCls) {
+ return NO_OP_LOGGER;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/package-info.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/package-info.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/package-info.java
new file mode 100644
index 0000000..303f006
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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 contains several logging strategy realisations.
+ */
+package org.apache.ignite.ml.environment.logging;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/package-info.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/package-info.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/package-info.java
new file mode 100644
index 0000000..0f58d13
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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 contains environment utils for ML algorithms.
+ */
+package org.apache.ignite.ml.environment;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/DefaultParallelismStrategy.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/DefaultParallelismStrategy.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/DefaultParallelismStrategy.java
new file mode 100644
index 0000000..ce2ca50
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/DefaultParallelismStrategy.java
@@ -0,0 +1,85 @@
+/*
+ * 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.ml.environment.parallelism;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.apache.ignite.ml.math.functions.IgniteSupplier;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * All task should be processed by default thread pool.
+ */
+public class DefaultParallelismStrategy implements ParallelismStrategy {
+ /** Strategy Pool. */
+ private ExecutorService pool = Executors.newWorkStealingPool(4);
+
+ /** {@inheritDoc} */
+ @Override public <T> Promise<T> submit(IgniteSupplier<T> task) {
+ return new FutureWrapper<>(pool.submit(task::get));
+ }
+
+ /**
+ * Wrapper for future class.
+ *
+ * @param <T>
+ */
+ public static class FutureWrapper<T> implements Promise<T> {
+ private final Future<T> f;
+
+ /**
+ * Create an instance of FutureWrapper.
+ *
+ * @param f Future.
+ */
+ public FutureWrapper(Future<T> f) {
+ this.f = f;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean cancel(boolean mayInterruptIfRunning) {
+ return f.cancel(mayInterruptIfRunning);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isCancelled() {
+ return f.isCancelled();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isDone() {
+ return f.isDone();
+ }
+
+ /** {@inheritDoc} */
+ @Override public T get() throws InterruptedException, ExecutionException {
+ return f.get();
+ }
+
+ /** {@inheritDoc} */
+ @Override public T get(long timeout,
+ @NotNull TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+
+ return f.get(timeout, unit);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/NoParallelismStrategy.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/NoParallelismStrategy.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/NoParallelismStrategy.java
new file mode 100644
index 0000000..5f605a7
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/NoParallelismStrategy.java
@@ -0,0 +1,87 @@
+/*
+ * 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.ml.environment.parallelism;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.apache.ignite.ml.math.functions.IgniteSupplier;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * All tasks should be processed in one thread.
+ */
+public class NoParallelismStrategy implements ParallelismStrategy {
+ /** Instance. */
+ public static final ParallelismStrategy INSTANCE = new NoParallelismStrategy();
+
+ /** */
+ private NoParallelismStrategy() {
+
+ }
+
+ /** {@inheritDoc} */
+ @Override public <T> Promise<T> submit(IgniteSupplier<T> task) {
+ return new Stub<>(task.get());
+ }
+
+ /**
+ * Stub for Future interface implementation.
+ *
+ * @param <T> Type of result.
+ */
+ public static class Stub<T> implements Promise<T> {
+ private T result;
+
+ /**
+ * Create an instance of Stub
+ *
+ * @param result Execution result.
+ */
+ public Stub(T result) {
+ this.result = result;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean cancel(boolean mayInterruptIfRunning) {
+ return false;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isCancelled() {
+ return false;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isDone() {
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public T get() throws InterruptedException, ExecutionException {
+ return result;
+ }
+
+ /** {@inheritDoc} */
+ @Override public T get(long timeout,
+ @NotNull TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+
+ return result;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/ParallelismStrategy.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/ParallelismStrategy.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/ParallelismStrategy.java
new file mode 100644
index 0000000..cdf2d50
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/ParallelismStrategy.java
@@ -0,0 +1,47 @@
+/*
+ * 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.ml.environment.parallelism;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.ml.math.functions.IgniteSupplier;
+
+/**
+ * Specifies the behaviour of processes in ML-algorithms that can may be parallelized such as parallel learning in
+ * bagging, learning submodels for One-vs-All model, Cross-Validation etc.
+ */
+public interface ParallelismStrategy {
+ public enum Type {
+ NO_PARALLELISM,
+ ON_DEFAULT_POOL
+ }
+
+ /**
+ * Submit task.
+ *
+ * @param task Task.
+ */
+ public <T> Promise<T> submit(IgniteSupplier<T> task);
+
+ public default <T> List<Promise<T>> submit(List<IgniteSupplier<T>> tasks) {
+ List<Promise<T>> results = new ArrayList<>();
+ for(IgniteSupplier<T> task : tasks)
+ results.add(submit(task));
+ return results;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/Promise.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/Promise.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/Promise.java
new file mode 100644
index 0000000..dec3f43
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/Promise.java
@@ -0,0 +1,53 @@
+/*
+ * 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.ml.environment.parallelism;
+
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+/**
+ * Future interface extension for lambda-friendly interface.
+ *
+ * @param <T> Type of result.
+ */
+public interface Promise<T> extends Future<T> {
+ /**
+ * Await result of Future and return it.
+ * Wrap exceptions from Future to RuntimeException.
+ */
+ public default T unsafeGet() {
+ try {
+ return get();
+ } catch (InterruptedException | ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * Wrap result of Future to Optional-object.
+ * If Future throws an exception then it returns Optional.empty.
+ */
+ public default Optional<T> getOpt() {
+ try {
+ return Optional.of(get());
+ } catch (InterruptedException | ExecutionException e) {
+ return Optional.empty();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/package-info.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/package-info.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/package-info.java
new file mode 100644
index 0000000..22fe9af
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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 contains realisations of parallelism strategies for multi-thread algorithms.
+ */
+package org.apache.ignite.ml.environment.parallelism;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverJob.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverJob.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverJob.java
index d262efe..2f213b5 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverJob.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverJob.java
@@ -19,18 +19,16 @@ package org.apache.ignite.ml.genetic;
import java.util.Arrays;
import java.util.Random;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.LoggerResource;
import org.apache.ignite.transactions.Transaction;
-import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
-
/**
* Responsible for performing 'crossover' genetic operation for 2 X 'parent' chromosomes.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverTask.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverTask.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverTask.java
index 02d90be..9daa57a 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverTask.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverTask.java
@@ -21,7 +21,6 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.affinity.Affinity;
@@ -30,10 +29,9 @@ import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeJobResultPolicy;
import org.apache.ignite.compute.ComputeTaskAdapter;
-import org.apache.ignite.resources.IgniteInstanceResource;
-
import org.apache.ignite.ml.genetic.parameter.GAConfiguration;
import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
+import org.apache.ignite.resources.IgniteInstanceResource;
/**
* Responsible for assigning 2 X 'parent' chromosomes to produce 2 X 'child' chromosomes.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessJob.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessJob.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessJob.java
index c11490a..0bde403 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessJob.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessJob.java
@@ -19,18 +19,16 @@ package org.apache.ignite.ml.genetic;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.LoggerResource;
import org.apache.ignite.transactions.Transaction;
-import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
-
/**
* Responsible for performing fitness evaluation on an individual chromosome
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessTask.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessTask.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessTask.java
index cfae767..66fd795 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessTask.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessTask.java
@@ -20,7 +20,6 @@ package org.apache.ignite.ml.genetic;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.affinity.Affinity;
@@ -29,10 +28,9 @@ import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeJobResultPolicy;
import org.apache.ignite.compute.ComputeTaskAdapter;
-import org.apache.ignite.resources.IgniteInstanceResource;
-
import org.apache.ignite.ml.genetic.parameter.GAConfiguration;
import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
+import org.apache.ignite.resources.IgniteInstanceResource;
/**
* Responsible for fitness operation
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java
index 4133adf..92eab5e 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java
@@ -20,16 +20,13 @@ package org.apache.ignite.ml.genetic;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-
import javax.cache.Cache.Entry;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.SqlQuery;
-
import org.apache.ignite.ml.genetic.cache.GeneCacheConfig;
import org.apache.ignite.ml.genetic.cache.PopulationCacheConfig;
import org.apache.ignite.ml.genetic.parameter.GAConfiguration;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Gene.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Gene.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Gene.java
index f15d988..af1af3c 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Gene.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Gene.java
@@ -18,7 +18,6 @@
package org.apache.ignite.ml.genetic;
import java.util.concurrent.atomic.AtomicLong;
-
import org.apache.ignite.cache.query.annotations.QuerySqlField;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateTask.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateTask.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateTask.java
index 704cf00..9fd9147 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateTask.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateTask.java
@@ -22,9 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
-
import javax.cache.Cache.Entry;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
@@ -36,10 +34,9 @@ import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeJobResultPolicy;
import org.apache.ignite.compute.ComputeTaskAdapter;
-import org.apache.ignite.resources.IgniteInstanceResource;
-
import org.apache.ignite.ml.genetic.parameter.GAConfiguration;
import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
+import org.apache.ignite.resources.IgniteInstanceResource;
/**
* Responsible for applying mutation on respective chromosomes. <br/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionJob.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionJob.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionJob.java
index e657ca0..19f22c6 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionJob.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionJob.java
@@ -22,11 +22,10 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.transactions.Transaction;
-import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
-
/**
* Responsible for performing truncate selection
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionTask.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionTask.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionTask.java
index 09f17cb..00d00c1 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionTask.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionTask.java
@@ -21,9 +21,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.cache.Cache.Entry;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
@@ -35,8 +33,8 @@ import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeJobResultPolicy;
import org.apache.ignite.compute.ComputeTaskAdapter;
-import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
+import org.apache.ignite.resources.IgniteInstanceResource;
/**
* Responsible for performing truncate selection.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/functions/GAGridFunction.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/functions/GAGridFunction.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/functions/GAGridFunction.java
index 9911eea..2dddf4b 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/functions/GAGridFunction.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/functions/GAGridFunction.java
@@ -20,15 +20,13 @@ package org.apache.ignite.ml.genetic.functions;
import java.sql.SQLException;
import java.sql.Types;
import java.util.List;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
import org.apache.ignite.cache.query.annotations.QuerySqlFunction;
-import org.h2.tools.SimpleResultSet;
-
import org.apache.ignite.ml.genetic.Chromosome;
import org.apache.ignite.ml.genetic.Gene;
import org.apache.ignite.ml.genetic.utils.GAGridUtils;
+import org.h2.tools.SimpleResultSet;
/**
* Responsible for providing custom SQL functions to retrieve optimization results.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAConfiguration.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAConfiguration.java
index ccacda6..619f56d 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAConfiguration.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.ignite.ml.genetic.parameter;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.ignite.ml.genetic.Gene;
import org.apache.ignite.ml.genetic.IFitnessFunction;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java
index 76c292d..45056e1 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java
@@ -19,14 +19,11 @@ package org.apache.ignite.ml.genetic.utils;
import java.util.ArrayList;
import java.util.List;
-
import javax.cache.Cache.Entry;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.SqlQuery;
-
import org.apache.ignite.ml.genetic.Chromosome;
import org.apache.ignite.ml.genetic.Gene;
import org.apache.ignite.ml.genetic.cache.PopulationCacheConfig;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/knn/KNNUtils.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/knn/KNNUtils.java b/modules/ml/src/main/java/org/apache/ignite/ml/knn/KNNUtils.java
index 6c27ab7..b5a0cdb 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/knn/KNNUtils.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/knn/KNNUtils.java
@@ -21,8 +21,8 @@ import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.PartitionDataBuilder;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.structures.LabeledDataset;
import org.apache.ignite.ml.structures.LabeledVector;
import org.apache.ignite.ml.structures.partition.LabeledDatasetPartitionDataBuilderOnHeap;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/knn/classification/KNNClassificationModel.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/knn/classification/KNNClassificationModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/knn/classification/KNNClassificationModel.java
index 22b6832..c2c1c43 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/knn/classification/KNNClassificationModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/knn/classification/KNNClassificationModel.java
@@ -33,11 +33,12 @@ import org.apache.ignite.ml.Exporter;
import org.apache.ignite.ml.Model;
import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.distances.DistanceMeasure;
import org.apache.ignite.ml.math.distances.EuclideanDistance;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.structures.LabeledDataset;
import org.apache.ignite.ml.structures.LabeledVector;
+import org.apache.ignite.ml.util.ModelTrace;
import org.jetbrains.annotations.NotNull;
/**
@@ -270,4 +271,18 @@ public class KNNClassificationModel implements Model<Vector, Double>, Exportable
return k == that.k && distanceMeasure.equals(that.distanceMeasure) && stgy.equals(that.stgy);
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return toString(false);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ return ModelTrace.builder("KNNClassificationModel", pretty)
+ .addField("k", String.valueOf(k))
+ .addField("measure", distanceMeasure.getClass().getSimpleName())
+ .addField("strategy", stgy.name())
+ .toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/knn/classification/KNNClassificationTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/knn/classification/KNNClassificationTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/knn/classification/KNNClassificationTrainer.java
index 99b70ab..e0a81f9 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/knn/classification/KNNClassificationTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/knn/classification/KNNClassificationTrainer.java
@@ -19,14 +19,14 @@ package org.apache.ignite.ml.knn.classification;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.knn.KNNUtils;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.trainers.SingleLabelDatasetTrainer;
/**
* kNN algorithm trainer to solve multi-class classification task.
*/
-public class KNNClassificationTrainer implements SingleLabelDatasetTrainer<KNNClassificationModel> {
+public class KNNClassificationTrainer extends SingleLabelDatasetTrainer<KNNClassificationModel> {
/**
* Trains model based on the specified data.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/knn/regression/KNNRegressionModel.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/knn/regression/KNNRegressionModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/knn/regression/KNNRegressionModel.java
index 5db2a30..16dcd8a 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/knn/regression/KNNRegressionModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/knn/regression/KNNRegressionModel.java
@@ -20,10 +20,11 @@ import java.util.List;
import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
import org.apache.ignite.ml.knn.classification.KNNClassificationModel;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.structures.LabeledDataset;
import org.apache.ignite.ml.structures.LabeledVector;
+import org.apache.ignite.ml.util.ModelTrace;
/**
* This class provides kNN Multiple Linear Regression or Locally [weighted] regression (Simple and Weighted versions).
@@ -86,4 +87,18 @@ public class KNNRegressionModel extends KNNClassificationModel {
sum += neighbor.label();
return sum / (double)k;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return toString(false);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ return ModelTrace.builder("KNNClassificationModel", pretty)
+ .addField("k", String.valueOf(k))
+ .addField("measure", distanceMeasure.getClass().getSimpleName())
+ .addField("strategy", stgy.name())
+ .toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/knn/regression/KNNRegressionTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/knn/regression/KNNRegressionTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/knn/regression/KNNRegressionTrainer.java
index 5f1b349..395ce61 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/knn/regression/KNNRegressionTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/knn/regression/KNNRegressionTrainer.java
@@ -19,14 +19,14 @@ package org.apache.ignite.ml.knn.regression;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.knn.KNNUtils;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.trainers.SingleLabelDatasetTrainer;
/**
* kNN algorithm trainer to solve regression task.
*/
-public class KNNRegressionTrainer implements SingleLabelDatasetTrainer<KNNRegressionModel> {
+public class KNNRegressionTrainer extends SingleLabelDatasetTrainer<KNNRegressionModel> {
/**
* Trains model based on the specified data.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/Blas.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/Blas.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/Blas.java
index 18aea1a..a22ec06 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/Blas.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/Blas.java
@@ -26,9 +26,9 @@ import org.apache.ignite.ml.math.exceptions.NonSquareMatrixException;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.SparseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.primitives.vector.impl.SparseVector;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.util.MatrixUtil;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/Tracer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/Tracer.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/Tracer.java
index eacf0b8..d01b150 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/Tracer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/Tracer.java
@@ -117,7 +117,22 @@ public class Tracer {
public static void showAscii(Vector vec, String fmt) {
String cls = vec.getClass().getSimpleName();
- System.out.println(String.format(LOCALE, "%s(%d) [%s]", cls, vec.size(), mkString(vec, fmt)));
+ System.out.println(asAscii(vec, fmt, true));
+ }
+
+ /**
+ * @param vec Vector to show as plain text.
+ * @param fmt Format string for vector elements.
+ * @param showMeta Show vector type and size.
+ */
+ public static String asAscii(Vector vec, String fmt, boolean showMeta) {
+ String cls = vec.getClass().getSimpleName();
+ String vectorStr = mkString(vec, fmt);
+
+ if(showMeta)
+ return String.format(LOCALE, "%s(%d) [%s]", cls, vec.size(), vectorStr);
+ else
+ return String.format(LOCALE, "[%s]", vectorStr);
}
/**
@@ -159,15 +174,26 @@ public class Tracer {
* @param fmt Format string for matrix rows.
*/
public static void showAscii(Matrix mtx, String fmt) {
+ System.out.println(asAscii(mtx, fmt));
+ }
+
+
+ /**
+ * @param mtx {@link Matrix} object to show as a plain text.
+ * @param fmt Format string for matrix rows.
+ */
+ public static String asAscii(Matrix mtx, String fmt) {
+ StringBuilder builder = new StringBuilder();
String cls = mtx.getClass().getSimpleName();
int rows = mtx.rowSize();
int cols = mtx.columnSize();
- System.out.println(String.format(LOCALE, "%s(%dx%d)", cls, rows, cols));
+ builder.append(String.format(LOCALE, "%s(%dx%d)\n", cls, rows, cols));
for (int row = 0; row < rows; row++)
- System.out.println(rowStr(mtx, row, fmt));
+ builder.append(rowStr(mtx, row, fmt)).append(row != rows - 1 ? "\n" : "");
+ return builder.toString();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/DistanceMeasure.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/DistanceMeasure.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/DistanceMeasure.java
index 50324c1..88e9a41 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/DistanceMeasure.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/DistanceMeasure.java
@@ -17,8 +17,8 @@
package org.apache.ignite.ml.math.distances;
import java.io.Externalizable;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* This class is based on the corresponding class from Apache Common Math lib.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/EuclideanDistance.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/EuclideanDistance.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/EuclideanDistance.java
index 935e19b..fa5c21c 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/EuclideanDistance.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/EuclideanDistance.java
@@ -19,8 +19,8 @@ package org.apache.ignite.ml.math.distances;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.util.MatrixUtil;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/HammingDistance.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/HammingDistance.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/HammingDistance.java
index f08ff7b..ef50a69 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/HammingDistance.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/HammingDistance.java
@@ -19,10 +19,10 @@ package org.apache.ignite.ml.math.distances;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
import org.apache.ignite.ml.math.functions.Functions;
import org.apache.ignite.ml.math.functions.IgniteDoubleFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.util.MatrixUtil;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/ManhattanDistance.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/ManhattanDistance.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/ManhattanDistance.java
index d298e3c..bd3df14 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/ManhattanDistance.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/ManhattanDistance.java
@@ -19,8 +19,8 @@ package org.apache.ignite.ml.math.distances;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.util.MatrixUtil;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/AbstractMatrix.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/AbstractMatrix.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/AbstractMatrix.java
index bed32de..161b336 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/AbstractMatrix.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/AbstractMatrix.java
@@ -28,7 +28,6 @@ import java.util.Spliterator;
import java.util.function.Consumer;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.ml.math.Blas;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
import org.apache.ignite.ml.math.exceptions.ColumnIndexException;
import org.apache.ignite.ml.math.exceptions.RowIndexException;
@@ -38,6 +37,7 @@ import org.apache.ignite.ml.math.functions.IgniteDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
import org.apache.ignite.ml.math.functions.IgniteTriFunction;
import org.apache.ignite.ml.math.functions.IntIntToDoubleFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.primitives.vector.impl.VectorizedViewMatrix;
import org.apache.ignite.ml.math.util.MatrixUtil;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/DenseMatrix.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/DenseMatrix.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/DenseMatrix.java
index e4792ee..6dce522 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/DenseMatrix.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/DenseMatrix.java
@@ -17,13 +17,13 @@
package org.apache.ignite.ml.math.primitives.matrix.impl;
+import org.apache.ignite.ml.math.StorageConstants;
+import org.apache.ignite.ml.math.primitives.matrix.AbstractMatrix;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.OrderedMatrix;
-import org.apache.ignite.ml.math.StorageConstants;
-import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.primitives.matrix.storage.DenseMatrixStorage;
import org.apache.ignite.ml.math.primitives.vector.Vector;
-import org.apache.ignite.ml.math.primitives.matrix.AbstractMatrix;
+import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
/**
* Basic implementation for matrix.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/SparseMatrix.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/SparseMatrix.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/SparseMatrix.java
index 119bb8d..0c4f500 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/SparseMatrix.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/SparseMatrix.java
@@ -20,13 +20,13 @@ package org.apache.ignite.ml.math.primitives.matrix.impl;
import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
import it.unimi.dsi.fastutil.ints.IntIterator;
import it.unimi.dsi.fastutil.ints.IntSet;
+import org.apache.ignite.ml.math.StorageConstants;
+import org.apache.ignite.ml.math.functions.IgniteTriFunction;
+import org.apache.ignite.ml.math.primitives.matrix.AbstractMatrix;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.MatrixStorage;
-import org.apache.ignite.ml.math.StorageConstants;
import org.apache.ignite.ml.math.primitives.matrix.storage.SparseMatrixStorage;
import org.apache.ignite.ml.math.primitives.vector.Vector;
-import org.apache.ignite.ml.math.functions.IgniteTriFunction;
-import org.apache.ignite.ml.math.primitives.matrix.AbstractMatrix;
import org.apache.ignite.ml.math.primitives.vector.impl.SparseVector;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/ViewMatrix.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/ViewMatrix.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/ViewMatrix.java
index df769c7..592064c 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/ViewMatrix.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/impl/ViewMatrix.java
@@ -18,12 +18,12 @@
package org.apache.ignite.ml.math.primitives.matrix.impl;
import java.io.Externalizable;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.matrix.MatrixStorage;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
import org.apache.ignite.ml.math.primitives.matrix.AbstractMatrix;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
+import org.apache.ignite.ml.math.primitives.matrix.MatrixStorage;
import org.apache.ignite.ml.math.primitives.matrix.storage.ViewMatrixStorage;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Implements the rectangular view into the parent {@link Matrix}.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/storage/DenseMatrixStorage.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/storage/DenseMatrixStorage.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/storage/DenseMatrixStorage.java
index dcdaf4f..d21d8c6 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/storage/DenseMatrixStorage.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/storage/DenseMatrixStorage.java
@@ -22,9 +22,9 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Arrays;
import org.apache.ignite.ml.math.Blas;
-import org.apache.ignite.ml.math.primitives.matrix.MatrixStorage;
import org.apache.ignite.ml.math.StorageConstants;
import org.apache.ignite.ml.math.functions.IgniteIntIntToIntBiFunction;
+import org.apache.ignite.ml.math.primitives.matrix.MatrixStorage;
import org.apache.ignite.ml.math.util.MatrixUtil;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/storage/SparseMatrixStorage.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/storage/SparseMatrixStorage.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/storage/SparseMatrixStorage.java
index fb2f3d9..4a1355c 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/storage/SparseMatrixStorage.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/storage/SparseMatrixStorage.java
@@ -26,9 +26,9 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.HashMap;
import java.util.Map;
-import org.apache.ignite.ml.math.primitives.matrix.MatrixStorage;
import org.apache.ignite.ml.math.StorageConstants;
import org.apache.ignite.ml.math.functions.IgniteTriFunction;
+import org.apache.ignite.ml.math.primitives.matrix.MatrixStorage;
/**
* Storage for sparse, local, on-heap matrix.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/AbstractVector.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/AbstractVector.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/AbstractVector.java
index 01b630e..343ebf1 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/AbstractVector.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/AbstractVector.java
@@ -29,7 +29,6 @@ import java.util.Spliterator;
import java.util.function.Consumer;
import java.util.function.IntToDoubleFunction;
import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
import org.apache.ignite.ml.math.exceptions.IndexException;
import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
@@ -37,6 +36,7 @@ import org.apache.ignite.ml.math.functions.Functions;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.functions.IgniteDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteIntDoubleToDoubleBiFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.ViewMatrix;
import org.apache.ignite.ml.math.primitives.vector.impl.VectorView;
import org.jetbrains.annotations.NotNull;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/Vector.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/Vector.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/Vector.java
index 41ce988..f544405 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/Vector.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/Vector.java
@@ -22,7 +22,6 @@ import java.util.Spliterator;
import java.util.function.IntToDoubleFunction;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.ml.math.Destroyable;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.MetaAttributes;
import org.apache.ignite.ml.math.StorageOpsMetrics;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
@@ -31,6 +30,7 @@ import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.functions.IgniteDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteIntDoubleToDoubleBiFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
/**
* A vector interface.
@@ -513,6 +513,7 @@ public interface Vector extends MetaAttributes, Externalizable, StorageOpsMetric
/**
* Returns array of doubles corresponds to vector components.
+ *
* @return Array of doubles.
*/
public default double[] asArray() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DelegatingVector.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DelegatingVector.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DelegatingVector.java
index b31f6fb..3a44373 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DelegatingVector.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DelegatingVector.java
@@ -25,12 +25,12 @@ import java.util.Map;
import java.util.Spliterator;
import java.util.function.IntToDoubleFunction;
import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
-import org.apache.ignite.ml.math.primitives.vector.VectorStorage;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.functions.IgniteDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteIntDoubleToDoubleBiFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
+import org.apache.ignite.ml.math.primitives.vector.VectorStorage;
/**
* Convenient class that can be used to add decorations to an existing vector. Subclasses
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DenseVector.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DenseVector.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DenseVector.java
index 48b9212..bed39e3 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DenseVector.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DenseVector.java
@@ -18,13 +18,13 @@
package org.apache.ignite.ml.math.primitives.vector.impl;
import java.util.Map;
+import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.storage.DenseVectorStorage;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.AbstractVector;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorStorage;
-import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
-import org.apache.ignite.ml.math.primitives.vector.AbstractVector;
+import org.apache.ignite.ml.math.primitives.vector.storage.DenseVectorStorage;
/**
* Basic implementation for vector.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/SparseVector.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/SparseVector.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/SparseVector.java
index 8b3a274..673ad79 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/SparseVector.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/SparseVector.java
@@ -22,11 +22,11 @@ import java.util.Map;
import java.util.Set;
import java.util.Spliterator;
import java.util.function.Consumer;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.StorageConstants;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.SparseMatrix;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.AbstractVector;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.storage.SparseVectorStorage;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/VectorView.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/VectorView.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/VectorView.java
index 5342a22..c5d689e 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/VectorView.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/VectorView.java
@@ -18,11 +18,11 @@
package org.apache.ignite.ml.math.primitives.vector.impl;
import java.io.Externalizable;
+import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
+import org.apache.ignite.ml.math.primitives.vector.AbstractVector;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorStorage;
-import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
-import org.apache.ignite.ml.math.primitives.vector.AbstractVector;
import org.apache.ignite.ml.math.primitives.vector.storage.VectorViewStorage;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/VectorizedViewMatrix.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/VectorizedViewMatrix.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/VectorizedViewMatrix.java
index 26f7b03..5990567 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/VectorizedViewMatrix.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/VectorizedViewMatrix.java
@@ -20,10 +20,10 @@ package org.apache.ignite.ml.math.primitives.vector.impl;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.IndexException;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.vector.AbstractVector;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.storage.VectorizedViewMatrixStorage;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/storage/VectorizedViewMatrixStorage.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/storage/VectorizedViewMatrixStorage.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/storage/VectorizedViewMatrixStorage.java
index 919301f..970e30b 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/storage/VectorizedViewMatrixStorage.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/storage/VectorizedViewMatrixStorage.java
@@ -20,9 +20,9 @@ package org.apache.ignite.ml.math.primitives.vector.storage;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.apache.ignite.ml.math.exceptions.IndexException;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.vector.VectorStorage;
-import org.apache.ignite.ml.math.exceptions.IndexException;
/**
* Row, column or diagonal vector-based view of the matrix
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MatrixUtil.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MatrixUtil.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MatrixUtil.java
index 0fd3cc6..e4554e9 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MatrixUtil.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MatrixUtil.java
@@ -19,14 +19,14 @@ package org.apache.ignite.ml.math.util;
import java.util.List;
import org.apache.ignite.internal.util.GridArgumentCheck;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.StorageConstants;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.functions.IgniteTriFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
-import org.apache.ignite.ml.math.primitives.matrix.impl.ViewMatrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.SparseMatrix;
+import org.apache.ignite.ml.math.primitives.matrix.impl.ViewMatrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/nn/MLPTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/nn/MLPTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/nn/MLPTrainer.java
index 6588059..6727ba9 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/nn/MLPTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/nn/MLPTrainer.java
@@ -27,12 +27,12 @@ import org.apache.ignite.ml.dataset.primitive.builder.context.EmptyContextBuilde
import org.apache.ignite.ml.dataset.primitive.builder.data.SimpleLabeledDatasetDataBuilder;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
import org.apache.ignite.ml.dataset.primitive.data.SimpleLabeledDatasetData;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.functions.IgniteDifferentiableVectorToDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.nn.architecture.MLPArchitecture;
import org.apache.ignite.ml.nn.initializers.RandomInitializer;
import org.apache.ignite.ml.optimization.updatecalculators.ParameterUpdateCalculator;
@@ -44,7 +44,7 @@ import org.apache.ignite.ml.util.Utils;
*
* @param <P> Type of model update used in this trainer.
*/
-public class MLPTrainer<P extends Serializable> implements MultiLabelDatasetTrainer<MultilayerPerceptron> {
+public class MLPTrainer<P extends Serializable> extends MultiLabelDatasetTrainer<MultilayerPerceptron> {
/** Multilayer perceptron architecture supplier that defines layers and activators. */
private final IgniteFunction<Dataset<EmptyContext, SimpleLabeledDatasetData>, MLPArchitecture> archSupplier;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/nn/MultilayerPerceptron.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/nn/MultilayerPerceptron.java b/modules/ml/src/main/java/org/apache/ignite/ml/nn/MultilayerPerceptron.java
index a2c2c6e..639bb44 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/nn/MultilayerPerceptron.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/nn/MultilayerPerceptron.java
@@ -24,12 +24,13 @@ import java.util.List;
import java.util.Random;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.ml.Model;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
+import org.apache.ignite.ml.math.Tracer;
import org.apache.ignite.ml.math.functions.IgniteDifferentiableDoubleToDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteDifferentiableVectorToDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.nn.architecture.MLPArchitecture;
import org.apache.ignite.ml.nn.architecture.TransformationLayerArchitecture;
@@ -560,4 +561,28 @@ public class MultilayerPerceptron implements Model<Matrix, Matrix>, SmoothParame
return diff;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return toString(false);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ StringBuilder builder = new StringBuilder("MultilayerPerceptron [\n");
+ if(below != null)
+ builder.append("below = \n").append(below.toString(pretty)).append("\n\n");
+ builder.append("layers = [").append(pretty ? "\n" : "");
+ for(int i = 0; i < layers.size(); i++) {
+ MLPLayer layer = layers.get(i);
+ builder.append("\tlayer").append(i).append(" = [\n");
+ if(layer.biases != null)
+ builder.append("\t\tbias = ").append(Tracer.asAscii(layer.biases, "%.4f", false)).append("\n");
+ String matrix = Tracer.asAscii(layer.weights, "%.4f").replaceAll("\n", "\n\t\t\t");
+ builder.append("\t\tweights = [\n\t\t\t").append(matrix).append("\n\t\t]");
+ builder.append("\n\t]\n");
+ }
+ builder.append("]");
+ return builder.toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/nn/ReplicatedVectorMatrix.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/nn/ReplicatedVectorMatrix.java b/modules/ml/src/main/java/org/apache/ignite/ml/nn/ReplicatedVectorMatrix.java
index 533bc74..2aa0437 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/nn/ReplicatedVectorMatrix.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/nn/ReplicatedVectorMatrix.java
@@ -23,9 +23,6 @@ import java.io.ObjectOutput;
import java.util.Map;
import java.util.Spliterator;
import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.matrix.MatrixStorage;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
import org.apache.ignite.ml.math.functions.IgniteBiConsumer;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
@@ -33,7 +30,10 @@ import org.apache.ignite.ml.math.functions.IgniteDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
import org.apache.ignite.ml.math.functions.IgniteTriFunction;
import org.apache.ignite.ml.math.functions.IntIntToDoubleFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
+import org.apache.ignite.ml.math.primitives.matrix.MatrixStorage;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Convenient way to create matrix of replicated columns or rows from vector.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/LossFunctions.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/LossFunctions.java b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/LossFunctions.java
index d328d63..741337e 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/LossFunctions.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/LossFunctions.java
@@ -17,9 +17,9 @@
package org.apache.ignite.ml.optimization;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteDifferentiableVectorToDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Class containing popular loss functions.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/SmoothParametrized.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/SmoothParametrized.java b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/SmoothParametrized.java
index 0611215..5eb8722 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/SmoothParametrized.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/SmoothParametrized.java
@@ -18,10 +18,10 @@
package org.apache.ignite.ml.optimization;
import org.apache.ignite.ml.Model;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteDifferentiableVectorToDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Interface for models which are smooth functions of their parameters.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/NesterovUpdateCalculator.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/NesterovUpdateCalculator.java b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/NesterovUpdateCalculator.java
index 0868d69..eb5c310 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/NesterovUpdateCalculator.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/NesterovUpdateCalculator.java
@@ -17,10 +17,10 @@
package org.apache.ignite.ml.optimization.updatecalculators;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteDifferentiableVectorToDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.optimization.SmoothParametrized;
/**
[18/18] ignite git commit: ignite-6467
Posted by sb...@apache.org.
ignite-6467
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0df5e61a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0df5e61a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0df5e61a
Branch: refs/heads/ignite-6467-1
Commit: 0df5e61a53cf68d0c81ff15643297bcd526e80a7
Parents: 5d9ca42
Author: sboikov <sb...@apache.org>
Authored: Wed Jul 25 09:34:01 2018 +0300
Committer: sboikov <sb...@apache.org>
Committed: Wed Jul 25 09:34:01 2018 +0300
----------------------------------------------------------------------
.../transactions/TxRollbackOnTimeoutTest.java | 2 +
.../testsuites/IgniteCacheTestSuite6.java | 63 +++++++++++++++++++-
2 files changed, 62 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0df5e61a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java
index d1cbfa7..88c1bbb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java
@@ -394,6 +394,8 @@ public class TxRollbackOnTimeoutTest extends GridCommonAbstractTest {
* Test timeouts with random values and different tx configurations.
*/
public void testRandomMixedTxConfigurations() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-8509");
+
final Ignite client = startClient();
final AtomicBoolean stop = new AtomicBoolean();
http://git-wip-us.apache.org/repos/asf/ignite/blob/0df5e61a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
index eaa4809..77285be 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
@@ -33,7 +33,14 @@ import org.apache.ignite.internal.processors.cache.WalModeChangeAdvancedSelfTest
import org.apache.ignite.internal.processors.cache.WalModeChangeCoordinatorNotAffinityNodeSelfTest;
import org.apache.ignite.internal.processors.cache.WalModeChangeSelfTest;
import org.apache.ignite.internal.processors.cache.datastructures.IgniteExchangeLatchManagerCoordinatorFailTest;
-import org.apache.ignite.internal.processors.cache.distributed.*;
+import org.apache.ignite.internal.processors.cache.distributed.CacheExchangeMergeTest;
+import org.apache.ignite.internal.processors.cache.distributed.CachePartitionStateTest;
+import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionEvictionDuringReadThroughSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteCache150ClientsTest;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheThreadLocalTxTest;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteOptimisticTxSuspendResumeMultiServerTest;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteOptimisticTxSuspendResumeTest;
+import org.apache.ignite.internal.processors.cache.distributed.IgnitePessimisticTxSuspendResumeTest;
import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCacheAssignmentNodeRestartsTest;
import org.apache.ignite.internal.processors.cache.transactions.TxLabelTest;
import org.apache.ignite.internal.processors.cache.transactions.TxMultiCacheAsyncOpsTest;
@@ -60,11 +67,61 @@ public class IgniteCacheTestSuite6 extends TestSuite {
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("IgniteCache Test Suite part 6");
+ suite.addTestSuite(CachePartitionStateTest.class);
+
+ suite.addTestSuite(GridCachePartitionEvictionDuringReadThroughSelfTest.class);
+ suite.addTestSuite(IgniteOptimisticTxSuspendResumeTest.class);
+ suite.addTestSuite(IgniteOptimisticTxSuspendResumeMultiServerTest.class);
+ suite.addTestSuite(IgnitePessimisticTxSuspendResumeTest.class);
+
suite.addTestSuite(CacheExchangeMergeTest.class);
- suite.addTestSuite(IgniteCacheClientNodeChangingTopologyTest.class);
+
suite.addTestSuite(TxRollbackOnTimeoutTest.class);
- suite.addTestSuite(TxRollbackOnTimeoutNearCacheTest.class);
suite.addTestSuite(TxRollbackOnTimeoutNoDeadlockDetectionTest.class);
+ suite.addTestSuite(TxRollbackOnTimeoutNearCacheTest.class);
+ suite.addTestSuite(TxWithSmallTimeoutAndContentionOneKeyTest.class);
+ suite.addTestSuite(IgniteCacheThreadLocalTxTest.class);
+ suite.addTestSuite(TxRollbackAsyncTest.class);
+ suite.addTestSuite(TxRollbackAsyncNearCacheTest.class);
+ suite.addTestSuite(TxRollbackAsyncWithPersistenceTest.class);
+ suite.addTestSuite(TxRollbackOnTopologyChangeTest.class);
+
+ suite.addTestSuite(TxOptimisticPrepareOnUnstableTopologyTest.class);
+
+ suite.addTestSuite(TxLabelTest.class);
+
+ suite.addTestSuite(TxMultiCacheAsyncOpsTest.class);
+
+ suite.addTestSuite(TxOnCachesStartTest.class);
+
+ suite.addTestSuite(IgnitePdsCacheAssignmentNodeRestartsTest.class);
+
+ suite.addTestSuite(WalModeChangeSelfTest.class);
+ suite.addTestSuite(WalModeChangeCoordinatorNotAffinityNodeSelfTest.class);
+ suite.addTestSuite(WalModeChangeAdvancedSelfTest.class);
+
+ suite.addTestSuite(IgniteCache150ClientsTest.class);
+
+// TODO enable this test after IGNITE-6753, now it takes too long
+// suite.addTestSuite(IgniteOutOfMemoryPropagationTest.class);
+
+ suite.addTestSuite(AuthenticationConfigurationClusterTest.class);
+ suite.addTestSuite(AuthenticationProcessorSelfTest.class);
+ suite.addTestSuite(AuthenticationOnNotActiveClusterTest.class);
+ suite.addTestSuite(AuthenticationProcessorNodeRestartTest.class);
+ suite.addTestSuite(AuthenticationProcessorNPEOnStartTest.class);
+
+ suite.addTestSuite(ReplicatedAtomicCacheGetsDistributionTest.class);
+ suite.addTestSuite(ReplicatedTransactionalOptimisticCacheGetsDistributionTest.class);
+ suite.addTestSuite(ReplicatedTransactionalPessimisticCacheGetsDistributionTest.class);
+
+ suite.addTestSuite(PartitionedAtomicCacheGetsDistributionTest.class);
+ suite.addTestSuite(PartitionedTransactionalOptimisticCacheGetsDistributionTest.class);
+ suite.addTestSuite(PartitionedTransactionalPessimisticCacheGetsDistributionTest.class);
+
+ suite.addTestSuite(TxOptimisticOnPartitionExchangeTest.class);
+
+ suite.addTestSuite(IgniteExchangeLatchManagerCoordinatorFailTest.class);
return suite;
}
[11/18] ignite git commit: IGNITE-5466 Web Console: Fixed action menu
after deleting cluster configuration.
Posted by sb...@apache.org.
IGNITE-5466 Web Console: Fixed action menu after deleting cluster configuration.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4abd1f3c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4abd1f3c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4abd1f3c
Branch: refs/heads/ignite-6467-1
Commit: 4abd1f3cf9c5258cd98c93b5c4245dbbdc824cfa
Parents: d0e6def
Author: Alexander Kalinin <ve...@yandex.ru>
Authored: Tue Jul 24 22:26:39 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Jul 24 22:26:39 2018 +0700
----------------------------------------------------------------------
.../app/components/page-configure-overview/controller.js | 5 +++++
.../app/components/page-configure-overview/template.pug | 1 +
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4abd1f3c/modules/web-console/frontend/app/components/page-configure-overview/controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure-overview/controller.js b/modules/web-console/frontend/app/components/page-configure-overview/controller.js
index 6a24f96..db21d9a 100644
--- a/modules/web-console/frontend/app/components/page-configure-overview/controller.js
+++ b/modules/web-console/frontend/app/components/page-configure-overview/controller.js
@@ -70,6 +70,9 @@ export default class PageConfigureOverviewController {
/** @param {Array<ig.config.cluster.ShortCluster>} clusters */
removeClusters(clusters) {
this.ConfigureState.dispatchAction(confirmClustersRemoval(clusters.map((c) => c._id)));
+
+ // TODO: Implement storing selected rows in store to share this data between other components.
+ this.selectedRows$.next([]);
}
/** @param {ig.config.cluster.ShortCluster} cluster */
@@ -137,6 +140,8 @@ export default class PageConfigureOverviewController {
/** @type {Subject<Array<ig.config.cluster.ShortCluster>>} */
this.selectedRows$ = new Subject();
+ this.selectedRowsIDs$ = this.selectedRows$.map((selectedClusters) => selectedClusters.map((cluster) => cluster._id));
+
this.actions$ = this.selectedRows$.map((selectedClusters) => [
{
action: 'Edit',
http://git-wip-us.apache.org/repos/asf/ignite/blob/4abd1f3c/modules/web-console/frontend/app/components/page-configure-overview/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure-overview/template.pug b/modules/web-console/frontend/app/components/page-configure-overview/template.pug
index d8bdf4f..ee7e4ec 100644
--- a/modules/web-console/frontend/app/components/page-configure-overview/template.pug
+++ b/modules/web-console/frontend/app/components/page-configure-overview/template.pug
@@ -33,6 +33,7 @@ h1.pc-page-header Configuration
on-action='$ctrl.onClustersAction($event)'
max-rows-to-show='10'
one-way-selection='::false'
+ selected-row-id='$ctrl.selectedRowsIDs$|async:this'
on-selection-change='$ctrl.selectedRows$.next($event)'
actions-menu='$ctrl.actions$|async:this'
)
[02/18] ignite git commit: IGNITE-8981: [ML] Parallel optimizations
for BaggingTrainer
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/ParameterUpdateCalculator.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/ParameterUpdateCalculator.java b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/ParameterUpdateCalculator.java
index 430483a..6e6a085 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/ParameterUpdateCalculator.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/ParameterUpdateCalculator.java
@@ -18,10 +18,10 @@
package org.apache.ignite.ml.optimization.updatecalculators;
import java.io.Serializable;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteDifferentiableVectorToDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Interface for classes encapsulating parameters updateCache logic.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/RPropUpdateCalculator.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/RPropUpdateCalculator.java b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/RPropUpdateCalculator.java
index 3a79641..17c4815 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/RPropUpdateCalculator.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/RPropUpdateCalculator.java
@@ -17,11 +17,11 @@
package org.apache.ignite.ml.optimization.updatecalculators;
+import org.apache.ignite.ml.math.functions.IgniteDifferentiableVectorToDoubleFunction;
+import org.apache.ignite.ml.math.functions.IgniteFunction;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteDifferentiableVectorToDoubleFunction;
-import org.apache.ignite.ml.math.functions.IgniteFunction;
import org.apache.ignite.ml.math.util.MatrixUtil;
import org.apache.ignite.ml.optimization.SmoothParametrized;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/SimpleGDUpdateCalculator.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/SimpleGDUpdateCalculator.java b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/SimpleGDUpdateCalculator.java
index dd23911..ede85c6 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/SimpleGDUpdateCalculator.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/SimpleGDUpdateCalculator.java
@@ -17,10 +17,10 @@
package org.apache.ignite.ml.optimization.updatecalculators;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteDifferentiableVectorToDoubleFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.optimization.SmoothParametrized;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/binarization/BinarizationPreprocessor.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/binarization/BinarizationPreprocessor.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/binarization/BinarizationPreprocessor.java
index e6fb0ed..8300820 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/binarization/BinarizationPreprocessor.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/binarization/BinarizationPreprocessor.java
@@ -17,8 +17,8 @@
package org.apache.ignite.ml.preprocessing.binarization;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Preprocessing function that makes binarization.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/binarization/BinarizationTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/binarization/BinarizationTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/binarization/BinarizationTrainer.java
index c84b32f..26541e0 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/binarization/BinarizationTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/binarization/BinarizationTrainer.java
@@ -18,8 +18,8 @@
package org.apache.ignite.ml.preprocessing.binarization;
import org.apache.ignite.ml.dataset.DatasetBuilder;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.preprocessing.PreprocessingTrainer;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/stringencoder/StringEncoderPreprocessor.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/stringencoder/StringEncoderPreprocessor.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/stringencoder/StringEncoderPreprocessor.java
index 46bc748..a1c5b77 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/stringencoder/StringEncoderPreprocessor.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/stringencoder/StringEncoderPreprocessor.java
@@ -19,10 +19,10 @@ package org.apache.ignite.ml.preprocessing.encoding.stringencoder;
import java.util.Map;
import java.util.Set;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
-import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.exceptions.preprocessing.UnknownStringValue;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
/**
* Preprocessing function that makes String encoding.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/stringencoder/StringEncoderTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/stringencoder/StringEncoderTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/stringencoder/StringEncoderTrainer.java
index 97cc7f8..ec16af4 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/stringencoder/StringEncoderTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/stringencoder/StringEncoderTrainer.java
@@ -27,8 +27,8 @@ import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.UpstreamEntry;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.preprocessing.PreprocessingTrainer;
import org.jetbrains.annotations.NotNull;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/imputing/ImputerPreprocessor.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/imputing/ImputerPreprocessor.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/imputing/ImputerPreprocessor.java
index 858eff4..3200d23 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/imputing/ImputerPreprocessor.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/imputing/ImputerPreprocessor.java
@@ -17,8 +17,8 @@
package org.apache.ignite.ml.preprocessing.imputing;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Preprocessing function that makes imputing.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/imputing/ImputerTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/imputing/ImputerTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/imputing/ImputerTrainer.java
index 001ef99..090b0a4 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/imputing/ImputerTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/imputing/ImputerTrainer.java
@@ -25,9 +25,9 @@ import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.UpstreamEntry;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.preprocessing.PreprocessingTrainer;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/minmaxscaling/MinMaxScalerPreprocessor.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/minmaxscaling/MinMaxScalerPreprocessor.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/minmaxscaling/MinMaxScalerPreprocessor.java
index 7c27306..87e369f 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/minmaxscaling/MinMaxScalerPreprocessor.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/minmaxscaling/MinMaxScalerPreprocessor.java
@@ -17,8 +17,8 @@
package org.apache.ignite.ml.preprocessing.minmaxscaling;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Preprocessing function that makes minmaxscaling. From mathematical point of view it's the following function which
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/minmaxscaling/MinMaxScalerTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/minmaxscaling/MinMaxScalerTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/minmaxscaling/MinMaxScalerTrainer.java
index d927fe6..6a39236 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/minmaxscaling/MinMaxScalerTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/minmaxscaling/MinMaxScalerTrainer.java
@@ -21,8 +21,8 @@ import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.UpstreamEntry;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.preprocessing.PreprocessingTrainer;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationPreprocessor.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationPreprocessor.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationPreprocessor.java
index 422ed8d..0cd0a90 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationPreprocessor.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationPreprocessor.java
@@ -17,10 +17,10 @@
package org.apache.ignite.ml.preprocessing.normalization;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.Functions;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.functions.IgniteDoubleFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Preprocessing function that makes normalization.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationTrainer.java
index d48bbc6..b2dc6ed 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationTrainer.java
@@ -18,8 +18,8 @@
package org.apache.ignite.ml.preprocessing.normalization;
import org.apache.ignite.ml.dataset.DatasetBuilder;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.preprocessing.PreprocessingTrainer;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/FeatureExtractorWrapper.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/FeatureExtractorWrapper.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/FeatureExtractorWrapper.java
index 1114131..8c3cd8b 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/FeatureExtractorWrapper.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/FeatureExtractorWrapper.java
@@ -18,9 +18,9 @@
package org.apache.ignite.ml.regressions.linear;
import java.util.Arrays;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.functions.IgniteBiFunction;
/**
* Feature extractor wrapper that adds additional column filled by 1.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionLSQRTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionLSQRTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionLSQRTrainer.java
index 0e9941f..8197779 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionLSQRTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionLSQRTrainer.java
@@ -20,12 +20,12 @@ package org.apache.ignite.ml.regressions.linear;
import java.util.Arrays;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.primitive.builder.data.SimpleLabeledDatasetDataBuilder;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
-import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.isolve.lsqr.AbstractLSQR;
import org.apache.ignite.ml.math.isolve.lsqr.LSQROnHeap;
import org.apache.ignite.ml.math.isolve.lsqr.LSQRResult;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
+import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.trainers.SingleLabelDatasetTrainer;
/**
@@ -33,7 +33,7 @@ import org.apache.ignite.ml.trainers.SingleLabelDatasetTrainer;
*
* @see AbstractLSQR
*/
-public class LinearRegressionLSQRTrainer implements SingleLabelDatasetTrainer<LinearRegressionModel> {
+public class LinearRegressionLSQRTrainer extends SingleLabelDatasetTrainer<LinearRegressionModel> {
/** {@inheritDoc} */
@Override public <K, V> LinearRegressionModel fit(DatasetBuilder<K, V> datasetBuilder,
IgniteBiFunction<K, V, Vector> featureExtractor, IgniteBiFunction<K, V, Double> lbExtractor) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModel.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModel.java
index 43c5b54..4d9d28e 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModel.java
@@ -99,9 +99,14 @@ public class LinearRegressionModel implements Model<Vector, Double>, Exportable<
return builder.toString();
}
- return "LinearRegressionModel{" +
+ return "LinearRegressionModel [" +
"weights=" + weights +
", intercept=" + intercept +
- '}';
+ ']';
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ return toString();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionSGDTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionSGDTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionSGDTrainer.java
index e033a98..2237c95 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionSGDTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionSGDTrainer.java
@@ -23,9 +23,9 @@ import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
import org.apache.ignite.ml.dataset.primitive.data.SimpleLabeledDatasetData;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.nn.Activators;
import org.apache.ignite.ml.nn.MLPTrainer;
@@ -38,7 +38,7 @@ import org.apache.ignite.ml.trainers.SingleLabelDatasetTrainer;
/**
* Trainer of the linear regression model based on stochastic gradient descent algorithm.
*/
-public class LinearRegressionSGDTrainer<P extends Serializable> implements SingleLabelDatasetTrainer<LinearRegressionModel> {
+public class LinearRegressionSGDTrainer<P extends Serializable> extends SingleLabelDatasetTrainer<LinearRegressionModel> {
/** Update strategy. */
private final UpdatesStrategy<? super MultilayerPerceptron, P> updatesStgy;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/binomial/LogisticRegressionModel.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/binomial/LogisticRegressionModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/binomial/LogisticRegressionModel.java
index a5938a2..f206532 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/binomial/LogisticRegressionModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/binomial/LogisticRegressionModel.java
@@ -192,9 +192,14 @@ public class LogisticRegressionModel implements Model<Vector, Double>, Exportabl
return builder.toString();
}
- return "LogisticRegressionModel{" +
+ return "LogisticRegressionModel [" +
"weights=" + weights +
", intercept=" + intercept +
- '}';
+ ']';
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ return toString();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/binomial/LogisticRegressionSGDTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/binomial/LogisticRegressionSGDTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/binomial/LogisticRegressionSGDTrainer.java
index 8ec9a7b..840a18d 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/binomial/LogisticRegressionSGDTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/binomial/LogisticRegressionSGDTrainer.java
@@ -23,9 +23,9 @@ import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
import org.apache.ignite.ml.dataset.primitive.data.SimpleLabeledDatasetData;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
import org.apache.ignite.ml.math.functions.IgniteFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.nn.Activators;
import org.apache.ignite.ml.nn.MLPTrainer;
@@ -38,7 +38,7 @@ import org.apache.ignite.ml.trainers.SingleLabelDatasetTrainer;
/**
* Trainer of the logistic regression model based on stochastic gradient descent algorithm.
*/
-public class LogisticRegressionSGDTrainer<P extends Serializable> implements SingleLabelDatasetTrainer<LogisticRegressionModel> {
+public class LogisticRegressionSGDTrainer<P extends Serializable> extends SingleLabelDatasetTrainer<LogisticRegressionModel> {
/** Update strategy. */
private final UpdatesStrategy<? super MultilayerPerceptron, P> updatesStgy;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassModel.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassModel.java
index 7e48a21..56d2d29 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassModel.java
@@ -89,6 +89,11 @@ public class LogRegressionMultiClassModel implements Model<Vector, Double>, Expo
return wholeStr.toString();
}
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ return toString();
+ }
+
/**
* Adds a specific Log Regression binary classifier to the bunch of same classifiers.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassTrainer.java
index 2d18107..1ed938a 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassTrainer.java
@@ -29,8 +29,8 @@ import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.PartitionDataBuilder;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.nn.MultilayerPerceptron;
import org.apache.ignite.ml.nn.UpdatesStrategy;
import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionSGDTrainer;
@@ -42,7 +42,7 @@ import org.apache.ignite.ml.trainers.SingleLabelDatasetTrainer;
* All common parameters are shared with bunch of binary classification trainers.
*/
public class LogRegressionMultiClassTrainer<P extends Serializable>
- implements SingleLabelDatasetTrainer<LogRegressionMultiClassModel> {
+ extends SingleLabelDatasetTrainer<LogRegressionMultiClassModel> {
/** Update strategy. */
private UpdatesStrategy<? super MultilayerPerceptron, P> updatesStgy;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/CrossValidation.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/CrossValidation.java b/modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/CrossValidation.java
index e2fbf89..f417fab 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/CrossValidation.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/CrossValidation.java
@@ -27,8 +27,8 @@ import org.apache.ignite.ml.Model;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.impl.cache.CacheBasedDatasetBuilder;
import org.apache.ignite.ml.dataset.impl.local.LocalDatasetBuilder;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.selection.scoring.cursor.CacheBasedLabelPairCursor;
import org.apache.ignite.ml.selection.scoring.cursor.LabelPairCursor;
import org.apache.ignite.ml.selection.scoring.cursor.LocalLabelPairCursor;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursor.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursor.java b/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursor.java
index ec8db14..037cf45 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursor.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursor.java
@@ -24,8 +24,8 @@ import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.ml.Model;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.selection.scoring.LabelPair;
import org.jetbrains.annotations.NotNull;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/cursor/LocalLabelPairCursor.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/cursor/LocalLabelPairCursor.java b/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/cursor/LocalLabelPairCursor.java
index e77608f..f135450 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/cursor/LocalLabelPairCursor.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/cursor/LocalLabelPairCursor.java
@@ -22,8 +22,8 @@ import java.util.Map;
import java.util.NoSuchElementException;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.ml.Model;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.selection.scoring.LabelPair;
import org.jetbrains.annotations.NotNull;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/evaluator/Evaluator.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/evaluator/Evaluator.java b/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/evaluator/Evaluator.java
index 9620897..4535831 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/evaluator/Evaluator.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/selection/scoring/evaluator/Evaluator.java
@@ -20,8 +20,8 @@ package org.apache.ignite.ml.selection.scoring.evaluator;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.ml.Model;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.selection.scoring.cursor.CacheBasedLabelPairCursor;
import org.apache.ignite.ml.selection.scoring.cursor.LabelPairCursor;
import org.apache.ignite.ml.selection.scoring.metric.Accuracy;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledDataset.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledDataset.java b/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledDataset.java
index 2968850..2440587 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledDataset.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledDataset.java
@@ -17,10 +17,10 @@
package org.apache.ignite.ml.structures;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
import org.apache.ignite.ml.math.exceptions.NoDataException;
import org.apache.ignite.ml.math.exceptions.knn.NoLabelVectorException;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/structures/partition/LabeledDatasetPartitionDataBuilderOnHeap.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/structures/partition/LabeledDatasetPartitionDataBuilderOnHeap.java b/modules/ml/src/main/java/org/apache/ignite/ml/structures/partition/LabeledDatasetPartitionDataBuilderOnHeap.java
index a7fae03..b4e552b 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/structures/partition/LabeledDatasetPartitionDataBuilderOnHeap.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/structures/partition/LabeledDatasetPartitionDataBuilderOnHeap.java
@@ -21,8 +21,8 @@ import java.io.Serializable;
import java.util.Iterator;
import org.apache.ignite.ml.dataset.PartitionDataBuilder;
import org.apache.ignite.ml.dataset.UpstreamEntry;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.structures.LabeledDataset;
import org.apache.ignite.ml.structures.LabeledVector;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/structures/preprocessing/LabeledDatasetLoader.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/structures/preprocessing/LabeledDatasetLoader.java b/modules/ml/src/main/java/org/apache/ignite/ml/structures/preprocessing/LabeledDatasetLoader.java
index 60ae0f8..5c20d9c 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/structures/preprocessing/LabeledDatasetLoader.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/structures/preprocessing/LabeledDatasetLoader.java
@@ -23,11 +23,11 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
import org.apache.ignite.ml.math.exceptions.NoDataException;
import org.apache.ignite.ml.math.exceptions.knn.EmptyFileException;
import org.apache.ignite.ml.math.exceptions.knn.FileParsingException;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.structures.LabeledDataset;
import org.apache.ignite.ml.structures.LabeledVector;
import org.jetbrains.annotations.NotNull;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearBinaryClassificationModel.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearBinaryClassificationModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearBinaryClassificationModel.java
index f0cdbea..4771e4a 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearBinaryClassificationModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearBinaryClassificationModel.java
@@ -181,9 +181,14 @@ public class SVMLinearBinaryClassificationModel implements Model<Vector, Double>
return builder.toString();
}
- return "SVMModel{" +
+ return "SVMModel [" +
"weights=" + weights +
", intercept=" + intercept +
- '}';
+ ']';
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ return toString();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearBinaryClassificationTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearBinaryClassificationTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearBinaryClassificationTrainer.java
index 53bb99f..1ae896f 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearBinaryClassificationTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearBinaryClassificationTrainer.java
@@ -22,8 +22,8 @@ import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.PartitionDataBuilder;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.structures.LabeledDataset;
import org.apache.ignite.ml.structures.LabeledVector;
@@ -37,7 +37,7 @@ import org.jetbrains.annotations.NotNull;
* and +1 labels for two classes and makes binary classification. </p> The paper about this algorithm could be found
* here https://arxiv.org/abs/1409.1458.
*/
-public class SVMLinearBinaryClassificationTrainer implements SingleLabelDatasetTrainer<SVMLinearBinaryClassificationModel> {
+public class SVMLinearBinaryClassificationTrainer extends SingleLabelDatasetTrainer<SVMLinearBinaryClassificationModel> {
/** Amount of outer SDCA algorithm iterations. */
private int amountOfIterations = 200;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearMultiClassClassificationModel.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearMultiClassClassificationModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearMultiClassClassificationModel.java
index 3765110..4b04824 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearMultiClassClassificationModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearMultiClassClassificationModel.java
@@ -88,6 +88,11 @@ public class SVMLinearMultiClassClassificationModel implements Model<Vector, Dou
return wholeStr.toString();
}
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ return toString();
+ }
+
/**
* Adds a specific SVM binary classifier to the bunch of same classifiers.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearMultiClassClassificationTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearMultiClassClassificationTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearMultiClassClassificationTrainer.java
index b571d0f..7069c4d 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearMultiClassClassificationTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearMultiClassClassificationTrainer.java
@@ -28,8 +28,8 @@ import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.PartitionDataBuilder;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.structures.partition.LabelPartitionDataBuilderOnHeap;
import org.apache.ignite.ml.structures.partition.LabelPartitionDataOnHeap;
import org.apache.ignite.ml.trainers.SingleLabelDatasetTrainer;
@@ -41,7 +41,7 @@ import org.apache.ignite.ml.trainers.SingleLabelDatasetTrainer;
* All common parameters are shared with bunch of binary classification trainers.
*/
public class SVMLinearMultiClassClassificationTrainer
- implements SingleLabelDatasetTrainer<SVMLinearMultiClassClassificationModel> {
+ extends SingleLabelDatasetTrainer<SVMLinearMultiClassClassificationModel> {
/** Amount of outer SDCA algorithm iterations. */
private int amountOfIterations = 20;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/trainers/DatasetTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/trainers/DatasetTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/trainers/DatasetTrainer.java
index 3fe0aa4..2f5d5d6 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/trainers/DatasetTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/trainers/DatasetTrainer.java
@@ -25,8 +25,9 @@ import org.apache.ignite.ml.Model;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.impl.cache.CacheBasedDatasetBuilder;
import org.apache.ignite.ml.dataset.impl.local.LocalDatasetBuilder;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
+import org.apache.ignite.ml.environment.LearningEnvironment;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* Interface for trainers. Trainer is just a function which produces model from the data.
@@ -34,7 +35,10 @@ import org.apache.ignite.ml.math.functions.IgniteBiFunction;
* @param <M> Type of a produced model.
* @param <L> Type of a label.
*/
-public interface DatasetTrainer<M extends Model, L> {
+public abstract class DatasetTrainer<M extends Model, L> {
+ /** Learning Environment. */
+ protected LearningEnvironment environment = LearningEnvironment.DEFAULT;
+
/**
* Trains model based on the specified data.
*
@@ -45,7 +49,7 @@ public interface DatasetTrainer<M extends Model, L> {
* @param <V> Type of a value in {@code upstream} data.
* @return Model.
*/
- public <K, V> M fit(DatasetBuilder<K, V> datasetBuilder, IgniteBiFunction<K, V, Vector> featureExtractor,
+ public abstract <K, V> M fit(DatasetBuilder<K, V> datasetBuilder, IgniteBiFunction<K, V, Vector> featureExtractor,
IgniteBiFunction<K, V, L> lbExtractor);
/**
@@ -59,7 +63,7 @@ public interface DatasetTrainer<M extends Model, L> {
* @param <V> Type of a value in {@code upstream} data.
* @return Model.
*/
- public default <K, V> M fit(Ignite ignite, IgniteCache<K, V> cache,
+ public <K, V> M fit(Ignite ignite, IgniteCache<K, V> cache,
IgniteBiFunction<K, V, Vector> featureExtractor, IgniteBiFunction<K, V, L> lbExtractor) {
return fit(
new CacheBasedDatasetBuilder<>(ignite, cache),
@@ -80,7 +84,7 @@ public interface DatasetTrainer<M extends Model, L> {
* @param <V> Type of a value in {@code upstream} data.
* @return Model.
*/
- public default <K, V> M fit(Ignite ignite, IgniteCache<K, V> cache, IgniteBiPredicate<K, V> filter,
+ public <K, V> M fit(Ignite ignite, IgniteCache<K, V> cache, IgniteBiPredicate<K, V> filter,
IgniteBiFunction<K, V, Vector> featureExtractor, IgniteBiFunction<K, V, L> lbExtractor) {
return fit(
new CacheBasedDatasetBuilder<>(ignite, cache, filter),
@@ -100,7 +104,7 @@ public interface DatasetTrainer<M extends Model, L> {
* @param <V> Type of a value in {@code upstream} data.
* @return Model.
*/
- public default <K, V> M fit(Map<K, V> data, int parts, IgniteBiFunction<K, V, Vector> featureExtractor,
+ public <K, V> M fit(Map<K, V> data, int parts, IgniteBiFunction<K, V, Vector> featureExtractor,
IgniteBiFunction<K, V, L> lbExtractor) {
return fit(
new LocalDatasetBuilder<>(data, parts),
@@ -121,7 +125,7 @@ public interface DatasetTrainer<M extends Model, L> {
* @param <V> Type of a value in {@code upstream} data.
* @return Model.
*/
- public default <K, V> M fit(Map<K, V> data, IgniteBiPredicate<K, V> filter, int parts,
+ public <K, V> M fit(Map<K, V> data, IgniteBiPredicate<K, V> filter, int parts,
IgniteBiFunction<K, V, Vector> featureExtractor,
IgniteBiFunction<K, V, L> lbExtractor) {
return fit(
@@ -130,4 +134,12 @@ public interface DatasetTrainer<M extends Model, L> {
lbExtractor
);
}
+
+ /**
+ * Sets learning Environment
+ * @param environment Environment.
+ */
+ public void setEnvironment(LearningEnvironment environment) {
+ this.environment = environment;
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/trainers/MultiLabelDatasetTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/trainers/MultiLabelDatasetTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/trainers/MultiLabelDatasetTrainer.java
index 0c6518f..5ae7de8 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/trainers/MultiLabelDatasetTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/trainers/MultiLabelDatasetTrainer.java
@@ -24,5 +24,5 @@ import org.apache.ignite.ml.Model;
*
* @param <M> Type of a produced model.
*/
-public interface MultiLabelDatasetTrainer<M extends Model> extends DatasetTrainer<M, double[]> {
+public abstract class MultiLabelDatasetTrainer<M extends Model> extends DatasetTrainer<M, double[]> {
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/trainers/SingleLabelDatasetTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/trainers/SingleLabelDatasetTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/trainers/SingleLabelDatasetTrainer.java
index eec8855..38dda93 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/trainers/SingleLabelDatasetTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/trainers/SingleLabelDatasetTrainer.java
@@ -24,5 +24,5 @@ import org.apache.ignite.ml.Model;
*
* @param <M> Type of a produced model.
*/
-public interface SingleLabelDatasetTrainer<M extends Model> extends DatasetTrainer<M, Double> {
+public abstract class SingleLabelDatasetTrainer<M extends Model> extends DatasetTrainer<M, Double> {
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTree.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTree.java b/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTree.java
index 9a912f7..c94d2dd 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTree.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTree.java
@@ -19,12 +19,13 @@ package org.apache.ignite.ml.tree;
import java.io.Serializable;
import java.util.Arrays;
+import java.util.Collections;
import org.apache.ignite.ml.dataset.Dataset;
import org.apache.ignite.ml.dataset.DatasetBuilder;
import org.apache.ignite.ml.dataset.primitive.builder.context.EmptyContextBuilder;
import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.trainers.DatasetTrainer;
import org.apache.ignite.ml.tree.data.DecisionTreeData;
import org.apache.ignite.ml.tree.data.DecisionTreeDataBuilder;
@@ -39,7 +40,7 @@ import org.apache.ignite.ml.tree.leaf.DecisionTreeLeafBuilder;
*
* @param <T> Type of impurity measure.
*/
-public abstract class DecisionTree<T extends ImpurityMeasure<T>> implements DatasetTrainer<DecisionTreeNode, Double> {
+public abstract class DecisionTree<T extends ImpurityMeasure<T>> extends DatasetTrainer<DecisionTreeNode, Double> {
/** Max tree deep. */
private final int maxDeep;
@@ -60,7 +61,8 @@ public abstract class DecisionTree<T extends ImpurityMeasure<T>> implements Data
* @param compressor Impurity function compressor.
* @param decisionTreeLeafBuilder Decision tree leaf builder.
*/
- DecisionTree(int maxDeep, double minImpurityDecrease, StepFunctionCompressor<T> compressor, DecisionTreeLeafBuilder decisionTreeLeafBuilder) {
+ DecisionTree(int maxDeep, double minImpurityDecrease, StepFunctionCompressor<T> compressor,
+ DecisionTreeLeafBuilder decisionTreeLeafBuilder) {
this.maxDeep = maxDeep;
this.minImpurityDecrease = minImpurityDecrease;
this.compressor = compressor;
@@ -131,7 +133,8 @@ public abstract class DecisionTree<T extends ImpurityMeasure<T>> implements Data
*/
private StepFunction<T>[] calculateImpurityForAllColumns(Dataset<EmptyContext, DecisionTreeData> dataset,
TreeFilter filter, ImpurityMeasureCalculator<T> impurityCalc) {
- return dataset.compute(
+
+ StepFunction<T>[] result = dataset.compute(
part -> {
if (compressor != null)
return compressor.compress(impurityCalc.calculate(part.filter(filter)));
@@ -139,6 +142,8 @@ public abstract class DecisionTree<T extends ImpurityMeasure<T>> implements Data
return impurityCalc.calculate(part.filter(filter));
}, this::reduce
);
+
+ return result;
}
/**
@@ -250,4 +255,47 @@ public abstract class DecisionTree<T extends ImpurityMeasure<T>> implements Data
this.threshold = threshold;
}
}
+
+ /**
+ * Represents DecisionTree as String.
+ *
+ * @param node Decision tree.
+ * @param pretty Use pretty mode.
+ */
+ public static String printTree(DecisionTreeNode node, boolean pretty) {
+ StringBuilder builder = new StringBuilder();
+ printTree(node, 0, builder, pretty, false);
+ return builder.toString();
+ }
+
+ /**
+ * Recursive realisation of DectisionTree to String converting.
+ *
+ * @param node Decision tree.
+ * @param depth Current depth.
+ * @param builder String builder.
+ * @param pretty Use pretty mode.
+ */
+ private static void printTree(DecisionTreeNode node, int depth, StringBuilder builder, boolean pretty, boolean isThen) {
+ builder.append(pretty ? String.join("", Collections.nCopies(depth, "\t")) : "");
+ if (node instanceof DecisionTreeLeafNode) {
+ DecisionTreeLeafNode leaf = (DecisionTreeLeafNode)node;
+ builder.append(String.format("%s return ", isThen ? "then" : "else"))
+ .append(String.format("%.4f", leaf.getVal()));
+ }
+ else if (node instanceof DecisionTreeConditionalNode) {
+ DecisionTreeConditionalNode condition = (DecisionTreeConditionalNode)node;
+ String prefix = depth == 0 ? "" : (isThen ? "then " : "else ");
+ builder.append(String.format("%sif (x", prefix))
+ .append(condition.getCol())
+ .append(" > ")
+ .append(String.format("%.4f", condition.getThreshold()))
+ .append(pretty ? ")\n" : ") ");
+ printTree(condition.getThenNode(), depth + 1, builder, pretty, true);
+ builder.append(pretty ? "\n" : " ");
+ printTree(condition.getElseNode(), depth + 1, builder, pretty, false);
+ }
+ else
+ throw new IllegalArgumentException();
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeConditionalNode.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeConditionalNode.java b/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeConditionalNode.java
index 110c199..f598165 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeConditionalNode.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeConditionalNode.java
@@ -77,4 +77,14 @@ public class DecisionTreeConditionalNode implements DecisionTreeNode {
public DecisionTreeNode getElseNode() {
return elseNode;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return toString(false);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ return DecisionTree.printTree(this, pretty);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeLeafNode.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeLeafNode.java b/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeLeafNode.java
index 7194511..97cc3ee 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeLeafNode.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeLeafNode.java
@@ -47,4 +47,14 @@ public class DecisionTreeLeafNode implements DecisionTreeNode {
public double getVal() {
return val;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return toString(false);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString(boolean pretty) {
+ return DecisionTree.printTree(this, pretty);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/tree/data/DecisionTreeDataBuilder.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/tree/data/DecisionTreeDataBuilder.java b/modules/ml/src/main/java/org/apache/ignite/ml/tree/data/DecisionTreeDataBuilder.java
index 9f8f2f7..0ff2012 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/tree/data/DecisionTreeDataBuilder.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/tree/data/DecisionTreeDataBuilder.java
@@ -21,8 +21,8 @@ import java.io.Serializable;
import java.util.Iterator;
import org.apache.ignite.ml.dataset.PartitionDataBuilder;
import org.apache.ignite.ml.dataset.UpstreamEntry;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
/**
* A partition {@code data} builder that makes {@link DecisionTreeData}.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/main/java/org/apache/ignite/ml/util/ModelTrace.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/util/ModelTrace.java b/modules/ml/src/main/java/org/apache/ignite/ml/util/ModelTrace.java
new file mode 100644
index 0000000..e6539d2
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/util/ModelTrace.java
@@ -0,0 +1,130 @@
+/*
+ * 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.ml.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Helper for model tracing.
+ */
+public class ModelTrace {
+ /** Model name. */
+ private final String mdlName;
+ /** Use pretty mode. */
+ private final boolean pretty;
+ /** Model fields. */
+ private List<IgniteBiTuple<String, Object>> mdlFields = new ArrayList<>();
+
+ /**
+ * Creates an instance of ModelTrace.
+ *
+ * @param mdlName Model name.
+ * @param pretty Pretty.
+ */
+ public static ModelTrace builder(String mdlName, boolean pretty) {
+ return new ModelTrace(mdlName, pretty);
+ }
+
+ /**
+ * Creates an instance of ModelTrace.
+ *
+ * @param mdlName Model name.
+ */
+ public static ModelTrace builder(String mdlName) {
+ return new ModelTrace(mdlName, false);
+ }
+
+ /**
+ * Creates an instance of ModelTrace.
+ *
+ * @param mdlName Model name.
+ * @param pretty Pretty.
+ */
+ private ModelTrace(String mdlName, boolean pretty) {
+ this.mdlName = mdlName;
+ this.pretty = pretty;
+ }
+
+ /**
+ * Add field.
+ *
+ * @param name Name.
+ * @param value Value.
+ */
+ public ModelTrace addField(String name, String value) {
+ mdlFields.add(new IgniteBiTuple<>(name, value));
+ return this;
+ }
+
+ /**
+ * Add field.
+ *
+ * @param name Name.
+ * @param values Values.
+ */
+ public ModelTrace addField(String name, List values) {
+ mdlFields.add(new IgniteBiTuple<>(name, values));
+ return this;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ StringBuilder builder = new StringBuilder();
+
+ final String ending = pretty ? "\n" : "";
+ final String fields = mdlFields.stream()
+ .map(kv -> fieldToString(kv, pretty))
+ .collect(Collectors.joining(pretty ? ",\n" : ", "));
+
+ builder.append(mdlName)
+ .append(" [").append(ending)
+ .append(fields)
+ .append(ending).append("]");
+
+ return builder.toString();
+ }
+
+ /**
+ * Convert Field Name-Value pair to string.
+ *
+ * @param kv Field name and value.
+ * @param pretty Use pretty mode.
+ */
+ @NotNull private String fieldToString(IgniteBiTuple<String, Object> kv, boolean pretty) {
+ StringBuilder builder = new StringBuilder(pretty ? "\t" : "")
+ .append(kv.getKey()).append(" = [");
+ if (kv.getValue() instanceof List) {
+ List list = (List)kv.getValue();
+ builder
+ .append(pretty ? "\n" : "")
+ .append(list.stream()
+ .map(x -> (pretty ? "\t\t" : "") + x)
+ .collect(Collectors.joining(pretty ? ",\n" : ", ")))
+ .append(pretty ? "\n\t]" : "]");
+ }
+ else {
+ builder.append(kv.getValue().toString())
+ .append("]");
+ }
+ return builder.toString();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/LocalModelsTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/LocalModelsTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/LocalModelsTest.java
index 43a80a9..3e3bab5 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/LocalModelsTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/LocalModelsTest.java
@@ -31,8 +31,8 @@ import org.apache.ignite.ml.dataset.impl.local.LocalDatasetBuilder;
import org.apache.ignite.ml.knn.classification.KNNClassificationModel;
import org.apache.ignite.ml.knn.classification.KNNModelFormat;
import org.apache.ignite.ml.knn.classification.KNNStrategy;
-import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.distances.EuclideanDistance;
+import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.regressions.linear.LinearRegressionModel;
import org.apache.ignite.ml.svm.SVMLinearBinaryClassificationModel;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/TestUtils.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/TestUtils.java b/modules/ml/src/test/java/org/apache/ignite/ml/TestUtils.java
index 64e3436..a4591fb 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/TestUtils.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/TestUtils.java
@@ -18,8 +18,8 @@
package org.apache.ignite.ml;
import java.util.stream.IntStream;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.Precision;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansModelTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansModelTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansModelTest.java
index 611b526..0d95d05 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansModelTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansModelTest.java
@@ -18,9 +18,9 @@
package org.apache.ignite.ml.clustering;
import org.apache.ignite.ml.clustering.kmeans.KMeansModel;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.distances.DistanceMeasure;
import org.apache.ignite.ml.math.distances.EuclideanDistance;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansTrainerTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansTrainerTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansTrainerTest.java
index 0bb4e01..8d2c341 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansTrainerTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansTrainerTest.java
@@ -23,9 +23,9 @@ import java.util.Map;
import org.apache.ignite.ml.clustering.kmeans.KMeansModel;
import org.apache.ignite.ml.clustering.kmeans.KMeansTrainer;
import org.apache.ignite.ml.dataset.impl.local.LocalDatasetBuilder;
+import org.apache.ignite.ml.math.distances.EuclideanDistance;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.distances.EuclideanDistance;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridCalculateFitnessTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridCalculateFitnessTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridCalculateFitnessTest.java
index 979e1e4..d931260 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridCalculateFitnessTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridCalculateFitnessTest.java
@@ -27,12 +27,11 @@ import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.ml.genetic.parameter.GAConfiguration;
import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
import org.junit.After;
-
-import static org.junit.Assert.*;
-
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
/**
* Calculate Fitness Test
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridInitializePopulationTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridInitializePopulationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridInitializePopulationTest.java
index 28b0196..168b2e8 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridInitializePopulationTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridInitializePopulationTest.java
@@ -27,12 +27,11 @@ import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.ml.genetic.parameter.GAConfiguration;
import org.apache.ignite.ml.genetic.parameter.GAGridConstants;
import org.junit.After;
-
-import static org.junit.Assert.*;
-
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
/**
* Initialize Gene and Chromosome Test
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/knn/KNNClassificationTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/knn/KNNClassificationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/knn/KNNClassificationTest.java
index 569a887..ab1ecee 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/knn/KNNClassificationTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/knn/KNNClassificationTest.java
@@ -25,9 +25,9 @@ import java.util.Map;
import org.apache.ignite.ml.knn.classification.KNNClassificationModel;
import org.apache.ignite.ml.knn.classification.KNNClassificationTrainer;
import org.apache.ignite.ml.knn.classification.KNNStrategy;
+import org.apache.ignite.ml.math.distances.EuclideanDistance;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.distances.EuclideanDistance;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.junit.Test;
import org.junit.runner.RunWith;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/knn/KNNRegressionTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/knn/KNNRegressionTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/knn/KNNRegressionTest.java
index d02d72a..586e6c8 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/knn/KNNRegressionTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/knn/KNNRegressionTest.java
@@ -26,9 +26,9 @@ import org.apache.ignite.ml.dataset.impl.local.LocalDatasetBuilder;
import org.apache.ignite.ml.knn.classification.KNNStrategy;
import org.apache.ignite.ml.knn.regression.KNNRegressionModel;
import org.apache.ignite.ml.knn.regression.KNNRegressionTrainer;
+import org.apache.ignite.ml.math.distances.EuclideanDistance;
import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.VectorUtils;
-import org.apache.ignite.ml.math.distances.EuclideanDistance;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/knn/LabeledDatasetTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/knn/LabeledDatasetTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/knn/LabeledDatasetTest.java
index 8ced650..a029e49 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/knn/LabeledDatasetTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/knn/LabeledDatasetTest.java
@@ -22,11 +22,11 @@ import java.net.URISyntaxException;
import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.ignite.ml.math.ExternalizableTest;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
import org.apache.ignite.ml.math.exceptions.NoDataException;
import org.apache.ignite.ml.math.exceptions.knn.EmptyFileException;
import org.apache.ignite.ml.math.exceptions.knn.FileParsingException;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.structures.LabeledDataset;
import org.apache.ignite.ml.structures.LabeledDatasetTestTrainPair;
import org.apache.ignite.ml.structures.LabeledVector;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
index a5e47a4..61bde69 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
@@ -22,9 +22,9 @@ import java.util.function.BiPredicate;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.SparseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.primitives.vector.impl.SparseVector;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplLocalTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplLocalTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplLocalTestSuite.java
index d917f61..b76a4c2 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplLocalTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplLocalTestSuite.java
@@ -18,24 +18,24 @@
package org.apache.ignite.ml.math;
import org.apache.ignite.ml.math.distances.DistanceTest;
+import org.apache.ignite.ml.math.isolve.lsqr.LSQROnHeapTest;
import org.apache.ignite.ml.math.primitives.matrix.DenseMatrixConstructorTest;
+import org.apache.ignite.ml.math.primitives.matrix.MatrixArrayStorageTest;
import org.apache.ignite.ml.math.primitives.matrix.MatrixAttributeTest;
+import org.apache.ignite.ml.math.primitives.matrix.MatrixStorageImplementationTest;
import org.apache.ignite.ml.math.primitives.matrix.MatrixViewConstructorTest;
import org.apache.ignite.ml.math.primitives.matrix.SparseMatrixConstructorTest;
-import org.apache.ignite.ml.math.primitives.matrix.MatrixArrayStorageTest;
-import org.apache.ignite.ml.math.primitives.matrix.MatrixStorageImplementationTest;
-import org.apache.ignite.ml.math.primitives.vector.VectorArrayStorageTest;
import org.apache.ignite.ml.math.primitives.vector.AbstractVectorTest;
import org.apache.ignite.ml.math.primitives.vector.DelegatingVectorConstructorTest;
import org.apache.ignite.ml.math.primitives.vector.DenseVectorConstructorTest;
import org.apache.ignite.ml.math.primitives.vector.MatrixVectorViewTest;
import org.apache.ignite.ml.math.primitives.vector.SparseVectorConstructorTest;
+import org.apache.ignite.ml.math.primitives.vector.VectorArrayStorageTest;
import org.apache.ignite.ml.math.primitives.vector.VectorAttributesTest;
import org.apache.ignite.ml.math.primitives.vector.VectorFoldMapTest;
import org.apache.ignite.ml.math.primitives.vector.VectorNormTest;
import org.apache.ignite.ml.math.primitives.vector.VectorToMatrixTest;
import org.apache.ignite.ml.math.primitives.vector.VectorViewTest;
-import org.apache.ignite.ml.math.isolve.lsqr.LSQROnHeapTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/TracerTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/TracerTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/TracerTest.java
index a164daf..1b78390d 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/TracerTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/TracerTest.java
@@ -27,8 +27,8 @@ import java.util.Optional;
import org.apache.ignite.ml.math.primitives.MathTestConstants;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
-import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.primitives.vector.Vector;
+import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.junit.Test;
import static java.nio.file.Files.createTempFile;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/matrix/MatrixBaseStorageTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/matrix/MatrixBaseStorageTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/matrix/MatrixBaseStorageTest.java
index d488ac9..499a457 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/matrix/MatrixBaseStorageTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/matrix/MatrixBaseStorageTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.ml.math.primitives.matrix;
import org.apache.ignite.ml.math.ExternalizeTest;
-import org.apache.ignite.ml.math.primitives.matrix.MatrixStorage;
import org.apache.ignite.ml.math.primitives.MathTestConstants;
import org.junit.After;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/matrix/MatrixStorageFixtures.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/matrix/MatrixStorageFixtures.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/matrix/MatrixStorageFixtures.java
index 2674c0a..cadf9fe 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/matrix/MatrixStorageFixtures.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/matrix/MatrixStorageFixtures.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.function.BiConsumer;
import java.util.function.Supplier;
-import org.apache.ignite.ml.math.primitives.matrix.MatrixStorage;
import org.apache.ignite.ml.math.StorageConstants;
import org.apache.ignite.ml.math.primitives.matrix.storage.SparseMatrixStorage;
import org.jetbrains.annotations.NotNull;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/AbstractVectorTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/AbstractVectorTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/AbstractVectorTest.java
index 2550c6f..bfc9557 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/AbstractVectorTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/AbstractVectorTest.java
@@ -19,10 +19,10 @@ package org.apache.ignite.ml.math.primitives.vector;
import java.util.Arrays;
import java.util.stream.StreamSupport;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.exceptions.IndexException;
import org.apache.ignite.ml.math.functions.Functions;
import org.apache.ignite.ml.math.primitives.MathTestConstants;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.vector.storage.DenseVectorStorage;
import org.junit.Assert;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/DelegatingVectorConstructorTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/DelegatingVectorConstructorTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/DelegatingVectorConstructorTest.java
index f5033e3..6b44c38 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/DelegatingVectorConstructorTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/DelegatingVectorConstructorTest.java
@@ -17,8 +17,8 @@
package org.apache.ignite.ml.math.primitives.vector;
-import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.primitives.vector.impl.DelegatingVector;
+import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/MatrixVectorViewTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/MatrixVectorViewTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/MatrixVectorViewTest.java
index b978729..922a1ef 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/MatrixVectorViewTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/MatrixVectorViewTest.java
@@ -17,8 +17,8 @@
package org.apache.ignite.ml.math.primitives.vector;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.exceptions.IndexException;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
import org.apache.ignite.ml.math.primitives.vector.impl.VectorizedViewMatrix;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorAttributesTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorAttributesTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorAttributesTest.java
index 691eeb1..7f7b31c 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorAttributesTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorAttributesTest.java
@@ -21,9 +21,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.function.Function;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.impl.DelegatingVector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.primitives.vector.impl.SparseVector;
-import org.apache.ignite.ml.math.primitives.vector.impl.DelegatingVector;
import org.apache.ignite.ml.math.primitives.vector.impl.VectorizedViewMatrix;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorBaseStorageTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorBaseStorageTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorBaseStorageTest.java
index b6c9721..64c93ac 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorBaseStorageTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorBaseStorageTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.ml.math.primitives.vector;
import org.apache.ignite.ml.math.ExternalizeTest;
-import org.apache.ignite.ml.math.primitives.vector.VectorStorage;
import org.apache.ignite.ml.math.primitives.MathTestConstants;
import org.junit.After;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java
index 549a5f8..d87478b 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java
@@ -29,12 +29,12 @@ import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.StorageConstants;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.impl.DelegatingVector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.primitives.vector.impl.SparseVector;
-import org.apache.ignite.ml.math.primitives.vector.impl.DelegatingVector;
import org.apache.ignite.ml.math.primitives.vector.impl.VectorizedViewMatrix;
import org.jetbrains.annotations.NotNull;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsTest.java
index 27fffb0..48e536e 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsTest.java
@@ -27,9 +27,9 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.ml.math.ExternalizeTest;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
+import org.apache.ignite.ml.math.primitives.vector.impl.DelegatingVector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.primitives.vector.impl.SparseVector;
-import org.apache.ignite.ml.math.primitives.vector.impl.DelegatingVector;
import org.apache.ignite.ml.math.primitives.vector.impl.VectorizedViewMatrix;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorToMatrixTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorToMatrixTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorToMatrixTest.java
index 09733b8..01ab049 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorToMatrixTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorToMatrixTest.java
@@ -22,10 +22,10 @@ import java.util.Map;
import java.util.function.BiConsumer;
import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
-import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.math.primitives.matrix.impl.SparseMatrix;
-import org.apache.ignite.ml.math.primitives.vector.impl.SparseVector;
import org.apache.ignite.ml.math.primitives.vector.impl.DelegatingVector;
+import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
+import org.apache.ignite.ml.math.primitives.vector.impl.SparseVector;
import org.apache.ignite.ml.math.primitives.vector.impl.VectorizedViewMatrix;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5dd09b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTest.java
index 5c09e43..51620b7 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTest.java
@@ -18,11 +18,11 @@
package org.apache.ignite.ml.nn;
import org.apache.ignite.ml.TestUtils;
-import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.Tracer;
-import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.functions.IgniteTriFunction;
+import org.apache.ignite.ml.math.primitives.matrix.Matrix;
import org.apache.ignite.ml.math.primitives.matrix.impl.DenseMatrix;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
import org.apache.ignite.ml.nn.architecture.MLPArchitecture;
import org.apache.ignite.ml.optimization.LossFunctions;
[07/18] ignite git commit: Revert deleteFutureData - Fixes #4236.
Posted by sb...@apache.org.
Revert deleteFutureData - Fixes #4236.
Signed-off-by: Dmitriy Pavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2e1b4b9c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2e1b4b9c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2e1b4b9c
Branch: refs/heads/ignite-6467-1
Commit: 2e1b4b9cd250f75b09e3641794efb2d6523812b4
Parents: 4201647
Author: NSAmelchev <ns...@gmail.com>
Authored: Tue Jul 24 17:34:00 2018 +0300
Committer: Dmitriy Pavlov <dp...@apache.org>
Committed: Tue Jul 24 17:35:00 2018 +0300
----------------------------------------------------------------------
.../discovery/zk/internal/ZookeeperClient.java | 126 +++++++++++++------
.../zk/internal/ZookeeperDiscoveryImpl.java | 13 +-
.../zk/internal/ZookeeperClientTest.java | 93 ++++++++++++++
3 files changed, 186 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e1b4b9c/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
index 6cc77a5..b58f0ce 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
@@ -19,6 +19,7 @@ package org.apache.ignite.spi.discovery.zk.internal;
import java.util.ArrayDeque;
import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
@@ -286,35 +287,64 @@ public class ZookeeperClient implements Watcher {
}
/**
- *
* @param paths Paths to create.
* @param createMode Create mode.
- * @throws KeeperException.NodeExistsException If at least one of target node already exists.
* @throws ZookeeperClientFailedException If connection to zk was lost.
* @throws InterruptedException If interrupted.
*/
void createAll(List<String> paths, CreateMode createMode)
- throws ZookeeperClientFailedException, InterruptedException, KeeperException.NodeExistsException
- {
- // TODO ZK: https://issues.apache.org/jira/browse/IGNITE-8188
- List<Op> ops = new ArrayList<>(paths.size());
+ throws ZookeeperClientFailedException, InterruptedException {
+ if (paths.isEmpty())
+ return;
- for (String path : paths)
- ops.add(Op.create(path, EMPTY_BYTES, ZK_ACL, createMode));
+ List<List<Op>> batches = new LinkedList<>();
- for (;;) {
- long connStartTime = this.connStartTime;
+ int batchSize = 0;
- try {
- zk.multi(ops);
+ List<Op> batch = new LinkedList<>();
- return;
- }
- catch (KeeperException.NodeExistsException e) {
- throw e;
+ for (String path : paths) {
+ //TODO ZK: https://issues.apache.org/jira/browse/IGNITE-8187
+ int size = requestOverhead(path) + 48 /* overhead */;
+
+ assert size <= MAX_REQ_SIZE;
+
+ if (batchSize + size > MAX_REQ_SIZE) {
+ batches.add(batch);
+
+ batch = new LinkedList<>();
+
+ batchSize = 0;
}
- catch (Exception e) {
- onZookeeperError(connStartTime, e);
+
+ batch.add(Op.create(path, EMPTY_BYTES, ZK_ACL, createMode));
+
+ batchSize += size;
+ }
+
+ batches.add(batch);
+
+ for (List<Op> ops : batches) {
+ for (;;) {
+ long connStartTime = this.connStartTime;
+
+ try {
+ zk.multi(ops);
+
+ break;
+ }
+ catch (KeeperException.NodeExistsException e) {
+ if (log.isDebugEnabled())
+ log.debug("Failed to create nodes using bulk operation: " + e);
+
+ for (Op op : ops)
+ createIfNeeded(op.getPath(), null, createMode);
+
+ break;
+ }
+ catch (Exception e) {
+ onZookeeperError(connStartTime, e);
+ }
}
}
}
@@ -560,38 +590,64 @@ public class ZookeeperClient implements Watcher {
* @param parent Parent path.
* @param paths Children paths.
* @param ver Version.
- * @throws KeeperException.NoNodeException If at least one of nodes does not exist.
* @throws ZookeeperClientFailedException If connection to zk was lost.
* @throws InterruptedException If interrupted.
*/
void deleteAll(@Nullable String parent, List<String> paths, int ver)
- throws KeeperException.NoNodeException, ZookeeperClientFailedException, InterruptedException
- {
+ throws ZookeeperClientFailedException, InterruptedException {
if (paths.isEmpty())
return;
- // TODO ZK: https://issues.apache.org/jira/browse/IGNITE-8188
- List<Op> ops = new ArrayList<>(paths.size());
+ List<List<Op>> batches = new LinkedList<>();
+
+ int batchSize = 0;
+
+ List<Op> batch = new LinkedList<>();
for (String path : paths) {
String path0 = parent != null ? parent + "/" + path : path;
- ops.add(Op.delete(path0, ver));
- }
+ //TODO ZK: https://issues.apache.org/jira/browse/IGNITE-8187
+ int size = requestOverhead(path0) + 17 /* overhead */;
- for (;;) {
- long connStartTime = this.connStartTime;
+ assert size <= MAX_REQ_SIZE;
- try {
- zk.multi(ops);
+ if (batchSize + size > MAX_REQ_SIZE) {
+ batches.add(batch);
- return;
- }
- catch (KeeperException.NoNodeException e) {
- throw e;
+ batch = new LinkedList<>();
+
+ batchSize = 0;
}
- catch (Exception e) {
- onZookeeperError(connStartTime, e);
+
+ batch.add(Op.delete(path0, ver));
+
+ batchSize += size;
+ }
+
+ batches.add(batch);
+
+ for (List<Op> ops : batches) {
+ for (;;) {
+ long connStartTime = this.connStartTime;
+
+ try {
+ zk.multi(ops);
+
+ break;
+ }
+ catch (KeeperException.NoNodeException e) {
+ if (log.isDebugEnabled())
+ log.debug("Failed to delete nodes using bulk operation: " + e);
+
+ for (Op op : ops)
+ deleteIfExists(op.getPath(), ver);
+
+ break;
+ }
+ catch (Exception e) {
+ onZookeeperError(connStartTime, e);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e1b4b9c/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
index 8b17622..dc687b8 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -814,17 +814,8 @@ public class ZookeeperDiscoveryImpl {
dirs.add(dir);
}
- try {
- if (!dirs.isEmpty())
- client.createAll(dirs, PERSISTENT);
- }
- catch (KeeperException.NodeExistsException e) {
- if (log.isDebugEnabled())
- log.debug("Failed to create nodes using bulk operation: " + e);
-
- for (String dir : dirs)
- client.createIfNeeded(dir, null, PERSISTENT);
- }
+ if (!dirs.isEmpty())
+ client.createAll(dirs, PERSISTENT);
}
catch (ZookeeperClientFailedException e) {
throw new IgniteSpiException("Failed to initialize Zookeeper nodes", e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e1b4b9c/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientTest.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientTest.java
index d228e03..0d64980 100644
--- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientTest.java
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientTest.java
@@ -142,6 +142,51 @@ public class ZookeeperClientTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ public void testCreateAllRequestOverflow() throws Exception {
+ startZK(1);
+
+ ZookeeperClient client = createClient(SES_TIMEOUT);
+
+ client.createIfNeeded("/apacheIgnite", null, CreateMode.PERSISTENT);
+
+ int cnt = 20_000;
+
+ List<String> paths = new ArrayList<>(cnt);
+
+ for (int i = 0; i < cnt; i++)
+ paths.add("/apacheIgnite/" + i);
+
+ client.createAll(paths, CreateMode.PERSISTENT);
+
+ assertEquals(cnt, client.getChildren("/apacheIgnite").size());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCreateAllNodeExists() throws Exception {
+ startZK(1);
+
+ ZookeeperClient client = createClient(SES_TIMEOUT);
+
+ client.createIfNeeded("/apacheIgnite", null, CreateMode.PERSISTENT);
+
+ client.createIfNeeded("/apacheIgnite/1", null, CreateMode.PERSISTENT);
+
+ List<String> paths = new ArrayList<>();
+
+ paths.add("/apacheIgnite/1");
+ paths.add("/apacheIgnite/2");
+ paths.add("/apacheIgnite/3");
+
+ client.createAll(paths, CreateMode.PERSISTENT);
+
+ assertEquals(3, client.getChildren("/apacheIgnite").size());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
public void testDeleteAll() throws Exception {
startZK(1);
@@ -164,6 +209,54 @@ public class ZookeeperClientTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ public void testDeleteAllRequestOverflow() throws Exception {
+ startZK(1);
+
+ ZookeeperClient client = createClient(SES_TIMEOUT);
+
+ client.createIfNeeded("/apacheIgnite", null, CreateMode.PERSISTENT);
+
+ int cnt = 30_000;
+
+ List<String> paths = new ArrayList<>(cnt);
+
+ for (int i = 0; i < cnt; i++)
+ paths.add("/apacheIgnite/" + i);
+
+ client.createAll(paths, CreateMode.PERSISTENT);
+
+ assertEquals(cnt, client.getChildren("/apacheIgnite").size());
+
+ List<String> subPaths = new ArrayList<>(cnt);
+
+ for (int i = 0; i < cnt; i++)
+ subPaths.add(String.valueOf(i));
+
+ client.deleteAll("/apacheIgnite", subPaths, -1);
+
+ assertTrue(client.getChildren("/apacheIgnite").isEmpty());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testDeleteAllNoNode() throws Exception {
+ startZK(1);
+
+ ZookeeperClient client = createClient(SES_TIMEOUT);
+
+ client.createIfNeeded("/apacheIgnite", null, CreateMode.PERSISTENT);
+ client.createIfNeeded("/apacheIgnite/1", null, CreateMode.PERSISTENT);
+ client.createIfNeeded("/apacheIgnite/2", null, CreateMode.PERSISTENT);
+
+ client.deleteAll("/apacheIgnite", Arrays.asList("1", "2", "3"), -1);
+
+ assertTrue(client.getChildren("/apacheIgnite").isEmpty());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
public void testConnectionLoss1() throws Exception {
ZookeeperClient client = new ZookeeperClient(log, "localhost:2200", 3000, null);
[09/18] ignite git commit: IGNITE-8791 Fixed missed update counter in
WAL data record for backup transaction - Fixes #4264.
Posted by sb...@apache.org.
IGNITE-8791 Fixed missed update counter in WAL data record for backup transaction - Fixes #4264.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/13e2a314
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/13e2a314
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/13e2a314
Branch: refs/heads/ignite-6467-1
Commit: 13e2a314b72d9155ce7f0126651805064e20358c
Parents: 281a400
Author: Pavel Kovalenko <jo...@gmail.com>
Authored: Tue Jul 24 17:48:57 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Jul 24 17:48:57 2018 +0300
----------------------------------------------------------------------
.../internal/pagemem/wal/record/DataEntry.java | 12 ++
.../pagemem/wal/record/LazyDataEntry.java | 3 +
.../GridDistributedTxRemoteAdapter.java | 44 +++--
.../wal/serializer/RecordDataV1Serializer.java | 4 +
...PdsAtomicCacheHistoricalRebalancingTest.java | 5 +
.../IgnitePdsCacheRebalancingAbstractTest.java | 179 +++++++++++++------
.../IgnitePdsTxCacheRebalancingTest.java | 1 -
.../IgnitePdsTxHistoricalRebalancingTest.java | 64 +++++++
modules/indexing/pom.xml | 7 +
.../IgnitePdsWithIndexingCoreTestSuite.java | 9 +-
10 files changed, 257 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/13e2a314/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataEntry.java
index 3511aff..d13a68a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataEntry.java
@@ -158,6 +158,18 @@ public class DataEntry {
}
/**
+ * Sets partition update counter to entry.
+ *
+ * @param partCnt Partition update counter.
+ * @return {@code this} for chaining.
+ */
+ public DataEntry partitionCounter(long partCnt) {
+ this.partCnt = partCnt;
+
+ return this;
+ }
+
+ /**
* @return Expire time.
*/
public long expireTime() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/13e2a314/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/LazyDataEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/LazyDataEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/LazyDataEntry.java
index 0ad87d7..6b56da5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/LazyDataEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/LazyDataEntry.java
@@ -96,6 +96,9 @@ public class LazyDataEntry extends DataEntry {
IgniteCacheObjectProcessor co = cctx.kernalContext().cacheObjects();
key = co.toKeyCacheObject(cacheCtx.cacheObjectContext(), keyType, keyBytes);
+
+ if (key.partition() == -1)
+ key.partition(partId);
}
return key;
http://git-wip-us.apache.org/repos/asf/ignite/blob/13e2a314/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index 5e3111c..1b9b3a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.stream.Collectors;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.InvalidEnvironmentException;
import org.apache.ignite.internal.IgniteInternalFuture;
@@ -63,6 +64,7 @@ import org.apache.ignite.internal.util.lang.GridTuple;
import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -485,7 +487,8 @@ public abstract class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
try {
Collection<IgniteTxEntry> entries = near() || cctx.snapshot().needTxReadLogging() ? allEntries() : writeEntries();
- List<DataEntry> dataEntries = null;
+ // Data entry to write to WAL and associated with it TxEntry.
+ List<T2<DataEntry, IgniteTxEntry>> dataEntries = null;
batchStoreCommit(writeMap().values());
@@ -571,17 +574,20 @@ public abstract class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
dataEntries = new ArrayList<>(entries.size());
dataEntries.add(
- new DataEntry(
- cacheCtx.cacheId(),
- txEntry.key(),
- val,
- op,
- nearXidVersion(),
- writeVersion(),
- 0,
- txEntry.key().partition(),
- txEntry.updateCounter()
- )
+ new T2<>(
+ new DataEntry(
+ cacheCtx.cacheId(),
+ txEntry.key(),
+ val,
+ op,
+ nearXidVersion(),
+ writeVersion(),
+ 0,
+ txEntry.key().partition(),
+ txEntry.updateCounter()
+ ),
+ txEntry
+ )
);
}
@@ -630,6 +636,8 @@ public abstract class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
dhtVer,
txEntry.updateCounter());
+ txEntry.updateCounter(updRes.updatePartitionCounter());
+
if (updRes.loggedPointer() != null)
ptr = updRes.loggedPointer();
@@ -665,6 +673,8 @@ public abstract class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
dhtVer,
txEntry.updateCounter());
+ txEntry.updateCounter(updRes.updatePartitionCounter());
+
if (updRes.loggedPointer() != null)
ptr = updRes.loggedPointer();
@@ -757,8 +767,14 @@ public abstract class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
}
}
- if (!near() && !F.isEmpty(dataEntries) && cctx.wal() != null)
- cctx.wal().log(new DataRecord(dataEntries));
+ if (!near() && !F.isEmpty(dataEntries) && cctx.wal() != null) {
+ // Set new update counters for data entries received from persisted tx entries.
+ List<DataEntry> entriesWithCounters = dataEntries.stream()
+ .map(tuple -> tuple.get1().partitionCounter(tuple.get2().updateCounter()))
+ .collect(Collectors.toList());
+
+ cctx.wal().log(new DataRecord(entriesWithCounters));
+ }
if (ptr != null && !cctx.tm().logTxRecords())
cctx.wal().flush(ptr, false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/13e2a314/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
index f433d26..ad06090 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
@@ -1505,6 +1505,10 @@ public class RecordDataV1Serializer implements RecordDataSerializer {
CacheObjectContext coCtx = cacheCtx.cacheObjectContext();
KeyCacheObject key = co.toKeyCacheObject(coCtx, keyType, keyBytes);
+
+ if (key.partition() == -1)
+ key.partition(partId);
+
CacheObject val = valBytes != null ? co.toCacheObject(coCtx, valType, valBytes) : null;
return new DataEntry(
http://git-wip-us.apache.org/repos/asf/ignite/blob/13e2a314/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsAtomicCacheHistoricalRebalancingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsAtomicCacheHistoricalRebalancingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsAtomicCacheHistoricalRebalancingTest.java
index f06494b..cce9a40 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsAtomicCacheHistoricalRebalancingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsAtomicCacheHistoricalRebalancingTest.java
@@ -35,6 +35,11 @@ public class IgnitePdsAtomicCacheHistoricalRebalancingTest extends IgnitePdsAtom
}
/** {@inheritDoc */
+ @Override protected long checkpointFrequency() {
+ return 15 * 1000;
+ }
+
+ /** {@inheritDoc */
@Override protected void beforeTest() throws Exception {
// Use rebalance from WAL if possible.
System.setProperty(IgniteSystemProperties.IGNITE_PDS_WAL_REBALANCE_THRESHOLD, "0");
http://git-wip-us.apache.org/repos/asf/ignite/blob/13e2a314/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
index 347412d..368c609 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
@@ -24,16 +24,19 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.Random;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import com.google.common.collect.Lists;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
-import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.PartitionLossPolicy;
@@ -137,8 +140,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
DataStorageConfiguration dsCfg = new DataStorageConfiguration()
.setConcurrencyLevel(Runtime.getRuntime().availableProcessors() * 4)
- .setPageSize(1024)
- .setCheckpointFrequency(10 * 1000)
+ .setCheckpointFrequency(checkpointFrequency())
.setWalMode(WALMode.LOG_ONLY)
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
.setName("dfltDataRegion")
@@ -167,6 +169,13 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
return res;
}
+ /**
+ * @return Checkpoint frequency;
+ */
+ protected long checkpointFrequency() {
+ return DataStorageConfiguration.DFLT_CHECKPOINT_FREQ;
+ }
+
/** {@inheritDoc} */
@Override protected long getTestTimeout() {
return 20 * 60 * 1000;
@@ -315,14 +324,17 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
* @throws Exception If failed.
*/
public void testTopologyChangesWithConstantLoad() throws Exception {
- final long timeOut = U.currentTimeMillis() + 10 * 60 * 1000;
+ final long timeOut = U.currentTimeMillis() + 5 * 60 * 1000;
final int entriesCnt = 10_000;
final int maxNodesCnt = 4;
- final int topChanges = 50;
+ final int topChanges = 25;
+ final boolean allowRemoves = true;
+ final AtomicLong orderCounter = new AtomicLong();
final AtomicBoolean stop = new AtomicBoolean();
final AtomicBoolean suspend = new AtomicBoolean();
+ final AtomicBoolean suspended = new AtomicBoolean();
final ConcurrentMap<Integer, TestValue> map = new ConcurrentHashMap<>();
@@ -333,45 +345,64 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
IgniteCache<Integer, TestValue> cache = ignite.cache(INDEXED_CACHE);
for (int i = 0; i < entriesCnt; i++) {
- cache.put(i, new TestValue(i, i));
- map.put(i, new TestValue(i, i));
+ long order = orderCounter.get();
+
+ cache.put(i, new TestValue(order, i, i));
+ map.put(i, new TestValue(order, i, i));
+
+ orderCounter.incrementAndGet();
}
final AtomicInteger nodesCnt = new AtomicInteger(4);
IgniteInternalFuture fut = runMultiThreadedAsync(new Callable<Void>() {
+ /**
+ * @param chance Chance of remove operation in percents.
+ * @return {@code true} if it should be remove operation.
+ */
+ private boolean removeOp(int chance) {
+ return ThreadLocalRandom.current().nextInt(100) + 1 <= chance;
+ }
+
@Override public Void call() throws Exception {
+ Random rnd = ThreadLocalRandom.current();
+
while (true) {
if (stop.get())
return null;
if (suspend.get()) {
+ suspended.set(true);
+
U.sleep(10);
continue;
}
- int k = ThreadLocalRandom.current().nextInt(entriesCnt);
- int v1 = ThreadLocalRandom.current().nextInt();
- int v2 = ThreadLocalRandom.current().nextInt();
+ int k = rnd.nextInt(entriesCnt);
+ long order = orderCounter.get();
- int n = nodesCnt.get();
+ int v1 = 0, v2 = 0;
+ boolean remove = false;
- if (n <= 0)
- continue;
+ if (removeOp(allowRemoves ? 20 : 0))
+ remove = true;
+ else {
+ v1 = rnd.nextInt();
+ v2 = rnd.nextInt();
+ }
+
+ int nodes = nodesCnt.get();
Ignite ignite;
try {
- ignite = grid(ThreadLocalRandom.current().nextInt(n));
+ ignite = grid(rnd.nextInt(nodes));
}
catch (Exception ignored) {
continue;
}
- if (ignite == null)
- continue;
-
Transaction tx = null;
boolean success = true;
@@ -379,7 +410,12 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
tx = ignite.transactions().txStart();
try {
- ignite.cache(INDEXED_CACHE).put(k, new TestValue(v1, v2));
+ IgniteCache<Object, Object> cache = ignite.cache(INDEXED_CACHE);
+
+ if (remove)
+ cache.remove(k);
+ else
+ cache.put(k, new TestValue(order, v1, v2));
}
catch (Exception ignored) {
success = false;
@@ -395,13 +431,19 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
}
}
- if (success)
- map.put(k, new TestValue(v1, v2));
+ if (success) {
+ map.put(k, new TestValue(order, v1, v2, remove));
+
+ orderCounter.incrementAndGet();
+ }
}
}
}, 1, "load-runner");
- boolean[] changes = new boolean[] {false, false, true, true};
+ // "False" means stop last started node, "True" - start new node.
+ List<Boolean> predefinedChanges = Lists.newArrayList(false, false, true, true);
+
+ List<Boolean> topChangesHistory = new ArrayList<>();
try {
for (int it = 0; it < topChanges; it++) {
@@ -410,32 +452,62 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
U.sleep(3_000);
- boolean add;
+ boolean addNode;
- if (it < changes.length)
- add = changes[it];
+ if (it < predefinedChanges.size())
+ addNode = predefinedChanges.get(it);
else if (nodesCnt.get() <= maxNodesCnt / 2)
- add = true;
+ addNode = true;
else if (nodesCnt.get() >= maxNodesCnt)
- add = false;
+ addNode = false;
else // More chance that node will be added
- add = ThreadLocalRandom.current().nextInt(3) <= 1;
+ addNode = ThreadLocalRandom.current().nextInt(3) <= 1;
- if (add)
+ if (addNode)
startGrid(nodesCnt.getAndIncrement());
else
stopGrid(nodesCnt.decrementAndGet());
+ topChangesHistory.add(addNode);
+
awaitPartitionMapExchange();
+ if (fut.error() != null)
+ break;
+
+ // Suspend loader and wait for last operation completion.
suspend.set(true);
+ GridTestUtils.waitForCondition(suspended::get, 5_000);
+
+ // Fix last successful cache operation to skip operations that can be performed during check.
+ long maxOrder = orderCounter.get();
- U.sleep(200);
+ for (Map.Entry<Integer, TestValue> entry : map.entrySet()) {
+ final String assertMsg = "Iteration: " + it + ". Changes: " + Objects.toString(topChangesHistory)
+ + ". Key: " + Integer.toString(entry.getKey());
- for (Map.Entry<Integer, TestValue> entry : map.entrySet())
- assertEquals(it + " " + Integer.toString(entry.getKey()), entry.getValue(), cache.get(entry.getKey()));
+ TestValue expected = entry.getValue();
+ if (expected.order < maxOrder)
+ continue;
+
+ TestValue actual = cache.get(entry.getKey());
+
+ if (expected.removed) {
+ assertNull(assertMsg + " should be removed.", actual);
+
+ continue;
+ }
+
+ if (entry.getValue().order < maxOrder)
+ continue;
+
+ assertEquals(assertMsg, expected, actual);
+ }
+
+ // Resume progress for loader.
suspend.set(false);
+ suspended.set(false);
}
}
finally {
@@ -443,11 +515,6 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
}
fut.get();
-
- awaitPartitionMapExchange();
-
- for (Map.Entry<Integer, TestValue> entry : map.entrySet())
- assertEquals(Integer.toString(entry.getKey()), entry.getValue(), cache.get(entry.getKey()));
}
/**
@@ -596,46 +663,52 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
*
*/
private static class TestValue implements Serializable {
+ /** Operation order. */
+ private final long order;
+
/** V 1. */
private final int v1;
+
/** V 2. */
private final int v2;
- /**
- * @param v1 V 1.
- * @param v2 V 2.
- */
- private TestValue(int v1, int v2) {
+ /** Flag indicates that value has removed. */
+ private final boolean removed;
+
+ private TestValue(long order, int v1, int v2) {
+ this(order, v1, v2, false);
+ }
+
+ private TestValue(long order, int v1, int v2, boolean removed) {
+ this.order = order;
this.v1 = v1;
this.v2 = v2;
+ this.removed = removed;
}
/** {@inheritDoc} */
@Override public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
+ if (this == o) return true;
- TestValue val = (TestValue)o;
+ if (o == null || getClass() != o.getClass()) return false;
- return v1 == val.v1 && v2 == val.v2;
+ TestValue testValue = (TestValue) o;
+ return order == testValue.order &&
+ v1 == testValue.v1 &&
+ v2 == testValue.v2;
}
/** {@inheritDoc} */
@Override public int hashCode() {
- int res = v1;
-
- res = 31 * res + v2;
-
- return res;
+ return Objects.hash(order, v1, v2);
}
/** {@inheritDoc} */
@Override public String toString() {
return "TestValue{" +
- "v1=" + v1 +
+ "order=" + order +
+ ", v1=" + v1 +
", v2=" + v2 +
'}';
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/13e2a314/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxCacheRebalancingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxCacheRebalancingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxCacheRebalancingTest.java
index c641ea4..3b324c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxCacheRebalancingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxCacheRebalancingTest.java
@@ -36,7 +36,6 @@ public class IgnitePdsTxCacheRebalancingTest extends IgnitePdsCacheRebalancingAb
ccfg.setCacheMode(CacheMode.PARTITIONED);
ccfg.setRebalanceMode(CacheRebalanceMode.SYNC);
ccfg.setBackups(1);
- ccfg.setRebalanceDelay(10_000);
ccfg.setAffinity(new RendezvousAffinityFunction(false, 32));
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/13e2a314/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxHistoricalRebalancingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxHistoricalRebalancingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxHistoricalRebalancingTest.java
new file mode 100644
index 0000000..8236bd3
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxHistoricalRebalancingTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.internal.processors.cache.persistence;
+
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalRebalanceTest;
+
+/**
+ *
+ */
+public class IgnitePdsTxHistoricalRebalancingTest extends IgnitePdsTxCacheRebalancingTest {
+ /** {@inheritDoc */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ cfg.setCommunicationSpi(new IgniteWalRebalanceTest.WalRebalanceCheckingCommunicationSpi());
+
+ return cfg;
+ }
+
+ /** {@inheritDoc */
+ @Override protected long checkpointFrequency() {
+ return 15 * 1000;
+ }
+
+ /** {@inheritDoc */
+ @Override protected void beforeTest() throws Exception {
+ // Use rebalance from WAL if possible.
+ System.setProperty(IgniteSystemProperties.IGNITE_PDS_WAL_REBALANCE_THRESHOLD, "0");
+
+ super.beforeTest();
+ }
+
+ /** {@inheritDoc */
+ @Override protected void afterTest() throws Exception {
+ boolean walRebalanceInvoked = !IgniteWalRebalanceTest.WalRebalanceCheckingCommunicationSpi.allRebalances()
+ .isEmpty();
+
+ IgniteWalRebalanceTest.WalRebalanceCheckingCommunicationSpi.cleanup();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_PDS_WAL_REBALANCE_THRESHOLD);
+
+ super.afterTest();
+
+ if (!walRebalanceInvoked)
+ throw new AssertionError("WAL rebalance hasn't been invoked.");
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/13e2a314/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index b6b7089..19b481f 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -119,6 +119,13 @@
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/ignite/blob/13e2a314/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java
index 2d967cd..491bab7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java
@@ -24,6 +24,7 @@ import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsBinarySo
import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCorruptedIndexTest;
import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsMarshallerMappingRestoreOnNodeStartTest;
import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsTxCacheRebalancingTest;
+import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsTxHistoricalRebalancingTest;
import org.apache.ignite.internal.processors.cache.persistence.IgnitePersistentStoreCacheGroupsTest;
import org.apache.ignite.internal.processors.cache.persistence.PersistenceDirectoryWarningLoggingTest;
import org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsMultiNodePutGetRestartTest;
@@ -62,11 +63,13 @@ public class IgnitePdsWithIndexingCoreTestSuite extends TestSuite {
suite.addTestSuite(IgniteWalRecoveryTest.class);
suite.addTestSuite(IgniteWalRecoveryWithCompactionTest.class);
suite.addTestSuite(IgnitePdsNoActualWalHistoryTest.class);
- suite.addTestSuite(IgnitePdsAtomicCacheRebalancingTest.class);
- suite.addTestSuite(IgnitePdsTxCacheRebalancingTest.class);
+ suite.addTestSuite(IgniteWalRebalanceTest.class);
+ suite.addTestSuite(IgnitePdsAtomicCacheRebalancingTest.class);
suite.addTestSuite(IgnitePdsAtomicCacheHistoricalRebalancingTest.class);
- suite.addTestSuite(IgniteWalRebalanceTest.class);
+
+ suite.addTestSuite(IgnitePdsTxCacheRebalancingTest.class);
+ suite.addTestSuite(IgnitePdsTxHistoricalRebalancingTest.class);
suite.addTestSuite(IgniteWalRecoveryPPCTest.class);
suite.addTestSuite(IgnitePdsDiskErrorsRecoveringTest.class);
[05/18] ignite git commit: IGNITE-9066 Web Console: Fixed table row
hovering style.
Posted by sb...@apache.org.
IGNITE-9066 Web Console: Fixed table row hovering style.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb20ed96
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb20ed96
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb20ed96
Branch: refs/heads/ignite-6467-1
Commit: cb20ed96b6915548cdfa921003c88a79ec32a71f
Parents: 9f5dd09
Author: Dmitriy Shabalin <dm...@gmail.com>
Authored: Tue Jul 24 20:25:33 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Jul 24 20:25:33 2018 +0700
----------------------------------------------------------------------
.../page-queries/components/queries-notebook/template.tpl.pug | 2 +-
.../frontend/app/components/ui-grid-hovering/style.scss | 6 ++++++
.../frontend/app/modules/nodes/nodes-dialog.tpl.pug | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb20ed96/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
index 3ccf440..44bfaa5 100644
--- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
+++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
@@ -245,7 +245,7 @@ mixin table-result-heading-scan
span.caret
mixin table-result-body
- .grid(ui-grid='paragraph.gridOptions' ui-grid-resize-columns ui-grid-exporter)
+ .grid(ui-grid='paragraph.gridOptions' ui-grid-resize-columns ui-grid-exporter ui-grid-hovering)
mixin chart-result
div(ng-hide='paragraph.scanExplain()')
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb20ed96/modules/web-console/frontend/app/components/ui-grid-hovering/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ui-grid-hovering/style.scss b/modules/web-console/frontend/app/components/ui-grid-hovering/style.scss
index 6c7597a..d660045 100644
--- a/modules/web-console/frontend/app/components/ui-grid-hovering/style.scss
+++ b/modules/web-console/frontend/app/components/ui-grid-hovering/style.scss
@@ -20,3 +20,9 @@
background: #ededed;
}
}
+
+.grid[ui-grid-hovering='ui-grid-hovering'] {
+ .ui-grid-row.ui-grid-row-hovered > [ui-grid-row] > .ui-grid-cell {
+ background: #ededed;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb20ed96/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug
index d9ea68c..21b138b 100644
--- a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug
+++ b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug
@@ -28,7 +28,7 @@
label Cache Nodes: {{ $ctrl.nodes.length }}
.panel-body.panel-body_collapse
- .grid(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-pinning)
+ .grid(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-pinning ui-grid-hovering)
.modal-footer
button.btn.btn-primary(id='confirm-btn-confirm' ng-click='$ok($ctrl.selected)' ng-disabled='$ctrl.selected.length === 0') Select node
[06/18] ignite git commit: IGNITE-5466 Web Console: Added missing
version switcher.
Posted by sb...@apache.org.
IGNITE-5466 Web Console: Added missing version switcher.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42016476
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42016476
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42016476
Branch: refs/heads/ignite-6467-1
Commit: 42016476dc03a0270437aa53a1b28da6f95fbeef
Parents: cb20ed9
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Tue Jul 24 21:30:21 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Jul 24 21:30:21 2018 +0700
----------------------------------------------------------------------
.../frontend/app/components/page-configure-overview/template.pug | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/42016476/modules/web-console/frontend/app/components/page-configure-overview/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure-overview/template.pug b/modules/web-console/frontend/app/components/page-configure-overview/template.pug
index 753ee06..d8bdf4f 100644
--- a/modules/web-console/frontend/app/components/page-configure-overview/template.pug
+++ b/modules/web-console/frontend/app/components/page-configure-overview/template.pug
@@ -15,6 +15,7 @@
limitations under the License.
h1.pc-page-header Configuration
+ version-picker
.pco-relative-root
.pco-table-context-buttons
@@ -37,4 +38,4 @@ h1.pc-page-header Configuration
)
footer-slot(ng-hide='($ctrl.shortClusters$|async:this).length' style='font-style: italic')
| You have no cluster configurations.
- a.link-success(ui-sref='base.configuration.edit.basic({clusterID: "new"})') Create one?
\ No newline at end of file
+ a.link-success(ui-sref='base.configuration.edit.basic({clusterID: "new"})') Create one?
\ No newline at end of file
[08/18] ignite git commit: IGNITE-8892 Fixed CacheQueryFuture usage
in DataStructures processor - Fixes #4415.
Posted by sb...@apache.org.
IGNITE-8892 Fixed CacheQueryFuture usage in DataStructures processor - Fixes #4415.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/281a4006
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/281a4006
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/281a4006
Branch: refs/heads/ignite-6467-1
Commit: 281a40064bf5fd3ebb24e313b08f848a51a64b93
Parents: 2e1b4b9
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Tue Jul 24 17:38:34 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Jul 24 17:38:34 2018 +0300
----------------------------------------------------------------------
.../processors/datastructures/GridCacheSetImpl.java | 6 ++++--
.../GridCacheFullTextQueryMultithreadedSelfTest.java | 11 ++++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/281a4006/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
index c27770f..0e3e102 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
@@ -168,11 +168,13 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements Ignite
qry.projection(ctx.grid().cluster().forNodes(nodes));
- Iterable<Integer> col = (Iterable<Integer>)qry.execute(new SumReducer()).get();
+ CacheQueryFuture<Integer> qryFut = qry.execute(new SumReducer());
int sum = 0;
- for (Integer val : col)
+ Integer val;
+
+ while((val = qryFut.next()) != null)
sum += val;
return sum;
http://git-wip-us.apache.org/repos/asf/ignite/blob/281a4006/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
index e12e246..acb3d73 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.cache;
-import java.util.Collection;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -26,6 +25,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.cache.query.CacheQuery;
+import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -105,12 +105,17 @@ public class GridCacheFullTextQueryMultithreadedSelfTest extends GridCacheAbstra
int cnt = 0;
while (!stop.get()) {
- Collection<Map.Entry<Integer, H2TextValue>> res = qry.execute().get();
+ CacheQueryFuture<Map.Entry<Integer, H2TextValue>> qryFut = qry.execute();
+
+ int size = 0;
+
+ while(qryFut.next() != null)
+ size++;
cnt++;
if (cnt % logFreq == 0) {
- X.println("Result set: " + res.size());
+ X.println("Result set: " + size);
X.println("Executed queries: " + cnt);
}
}
[16/18] ignite git commit: IGNITE-4010 Web Console: Implemented
responsive full screen layout.
Posted by sb...@apache.org.
IGNITE-4010 Web Console: Implemented responsive full screen layout.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ac62e614
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ac62e614
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ac62e614
Branch: refs/heads/ignite-6467-1
Commit: ac62e6147b897351dee4de1b47d85aaee3f9b024
Parents: 99e023b
Author: Alexander Kalinin <ve...@yandex.ru>
Authored: Wed Jul 25 11:50:59 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Jul 25 11:50:59 2018 +0700
----------------------------------------------------------------------
modules/web-console/frontend/app/app.js | 7 +-
.../connected-clusters-badge/style.scss | 2 +-
.../page-configure-overview/style.scss | 2 +-
.../page-configure-overview/template.pug | 14 +-
.../app/components/page-configure/states.js | 6 -
.../app/components/page-configure/template.pug | 10 +-
.../page-forgot-password/template.pug | 2 +-
.../app/components/page-profile/index.js | 12 +-
.../app/components/page-profile/style.scss | 3 +
.../app/components/page-profile/template.pug | 16 +-
.../components/queries-notebook/style.scss | 47 +++---
.../queries-notebook/template.tpl.pug | 161 +++++++++----------
.../queries-notebooks-list/controller.js | 2 +-
.../app/components/page-queries/index.js | 33 +---
.../app/components/page-signin/template.pug | 2 +-
.../app/components/page-signup/template.pug | 2 +-
.../components/web-console-footer/template.pug | 2 +-
.../components/web-console-header/style.scss | 7 +-
.../components/web-console-header/template.pug | 4 +-
.../frontend/app/modules/states/admin.state.js | 12 +-
.../app/modules/states/settings.state.js | 33 ++++
.../frontend/app/primitives/badge/index.scss | 2 +-
.../frontend/app/primitives/btn/index.scss | 5 +
.../frontend/public/stylesheets/style.scss | 73 +++++----
modules/web-console/frontend/views/403.tpl.pug | 2 +-
modules/web-console/frontend/views/404.tpl.pug | 2 +-
modules/web-console/frontend/views/base.pug | 4 +-
modules/web-console/frontend/views/base2.pug | 26 ---
.../frontend/views/includes/header-left.pug | 2 +-
.../frontend/views/includes/header-right.pug | 2 +-
.../frontend/webpack/webpack.common.js | 2 +-
31 files changed, 249 insertions(+), 250 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/app.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js
index 1ffc367..276eac8 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -29,6 +29,7 @@ import './modules/demo/Demo.module';
import './modules/states/logout.state';
import './modules/states/admin.state';
import './modules/states/errors.state';
+import './modules/states/settings.state';
// ignite:modules
import './core';
@@ -193,6 +194,7 @@ export default angular.module('ignite-console', [
'ignite-console.states.logout',
'ignite-console.states.admin',
'ignite-console.states.errors',
+ 'ignite-console.states.settings',
// Common modules.
'ignite-console.dialog',
'ignite-console.navbar',
@@ -311,11 +313,6 @@ export default angular.module('ignite-console', [
url: '',
abstract: true,
template: baseTemplate
- })
- .state('base.settings', {
- url: '/settings',
- abstract: true,
- template: '<ui-view></ui-view>'
});
$urlRouterProvider.otherwise('/404');
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/connected-clusters-badge/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/connected-clusters-badge/style.scss b/modules/web-console/frontend/app/components/connected-clusters-badge/style.scss
index e53b71a..3b2d202 100644
--- a/modules/web-console/frontend/app/components/connected-clusters-badge/style.scss
+++ b/modules/web-console/frontend/app/components/connected-clusters-badge/style.scss
@@ -21,7 +21,7 @@ connected-clusters {
div {
position: absolute;
top: 0;
- right: 0;
+ right: 30px;
display: flex;
align-items: center;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-configure-overview/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure-overview/style.scss b/modules/web-console/frontend/app/components/page-configure-overview/style.scss
index e198fa4..e461d06 100644
--- a/modules/web-console/frontend/app/components/page-configure-overview/style.scss
+++ b/modules/web-console/frontend/app/components/page-configure-overview/style.scss
@@ -27,7 +27,7 @@ page-configure-overview {
flex-direction: row;
&>* {
- margin-left: 10px;
+ margin-left: 20px;
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-configure-overview/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure-overview/template.pug b/modules/web-console/frontend/app/components/page-configure-overview/template.pug
index ee7e4ec..be8e999 100644
--- a/modules/web-console/frontend/app/components/page-configure-overview/template.pug
+++ b/modules/web-console/frontend/app/components/page-configure-overview/template.pug
@@ -14,11 +14,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-h1.pc-page-header Configuration
- version-picker
-
-.pco-relative-root
- .pco-table-context-buttons
+header.header-with-selector
+ div
+ h1 Configuration
+ version-picker
+ div
a.btn-ignite.btn-ignite--primary(
type='button'
ui-sref='^.edit({clusterID: "new"})'
@@ -26,6 +26,8 @@ h1.pc-page-header Configuration
svg.icon-left(ignite-icon='plus')
| Create Cluster Configuration
button-import-models(cluster-id='::"new"')
+
+.pco-relative-root
pc-items-table(
table-title='::"My Cluster Configurations"'
column-defs='$ctrl.clustersColumnDefs'
@@ -39,4 +41,4 @@ h1.pc-page-header Configuration
)
footer-slot(ng-hide='($ctrl.shortClusters$|async:this).length' style='font-style: italic')
| You have no cluster configurations.
- a.link-success(ui-sref='base.configuration.edit.basic({clusterID: "new"})') Create one?
\ No newline at end of file
+ a.link-success(ui-sref='base.configuration.edit.basic({clusterID: "new"})') Create one?
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-configure/states.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure/states.js b/modules/web-console/frontend/app/components/page-configure/states.js
index a75e851..e76b18e 100644
--- a/modules/web-console/frontend/app/components/page-configure/states.js
+++ b/modules/web-console/frontend/app/components/page-configure/states.js
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-import base2 from 'views/base2.pug';
import pageConfigureAdvancedClusterComponent from '../page-configure-advanced/components/page-configure-advanced-cluster/component';
import pageConfigureAdvancedModelsComponent from '../page-configure-advanced/components/page-configure-advanced-models/component';
import pageConfigureAdvancedCachesComponent from '../page-configure-advanced/components/page-configure-advanced-caches/component';
@@ -43,11 +42,6 @@ function registerStates($stateProvider) {
permission: 'configuration',
url: '/configuration',
onEnter: ['ConfigureState', (ConfigureState) => ConfigureState.dispatchAction({type: 'PRELOAD_STATE', state: {}})],
- views: {
- '@': {
- template: base2
- }
- },
resolve: {
_shortClusters: ['ConfigEffects', ({etp}) => {
return etp('LOAD_USER_CLUSTERS');
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-configure/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure/template.pug b/modules/web-console/frontend/app/components/page-configure/template.pug
index c56320b..bd299be 100644
--- a/modules/web-console/frontend/app/components/page-configure/template.pug
+++ b/modules/web-console/frontend/app/components/page-configure/template.pug
@@ -14,11 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-h1.pc-page-header
- span.pc-page-header-title
- | {{ $ctrl.clusterName$|async:this }}
+header.header-with-selector
+ div
+ h1 {{ $ctrl.clusterName$|async:this }}
version-picker
- button-import-models(cluster-id='$ctrl.clusterID$|async:this')
+ div
+ button-import-models(cluster-id='$ctrl.clusterID$|async:this')
+
div.pc-content-container
ul.tabs.tabs--blue
li(role='presentation' ui-sref-active='active')
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-forgot-password/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-forgot-password/template.pug b/modules/web-console/frontend/app/components/page-forgot-password/template.pug
index 58a8f7e..82e7898 100644
--- a/modules/web-console/frontend/app/components/page-forgot-password/template.pug
+++ b/modules/web-console/frontend/app/components/page-forgot-password/template.pug
@@ -20,7 +20,7 @@ web-console-header
web-console-header-left
ignite-header-title
-.container.body-container
+.container--responsive.body-container
section
- const form = '$ctrl.form'
h3 Forgot password?
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-profile/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-profile/index.js b/modules/web-console/frontend/app/components/page-profile/index.js
index faa3c21..d8b1a53 100644
--- a/modules/web-console/frontend/app/components/page-profile/index.js
+++ b/modules/web-console/frontend/app/components/page-profile/index.js
@@ -16,10 +16,7 @@
*/
import angular from 'angular';
-
import component from './component';
-import template from 'views/base2.pug';
-
import './style.scss';
export default angular
@@ -30,14 +27,7 @@ export default angular
// set up the states
$stateProvider.state('base.settings.profile', {
url: '/profile',
- views: {
- '@': {
- template
- },
- '@base.settings.profile': {
- component: 'pageProfile'
- }
- },
+ component: 'pageProfile',
permission: 'profile',
tfMetaTags: {
title: 'User profile'
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-profile/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-profile/style.scss b/modules/web-console/frontend/app/components/page-profile/style.scss
index 8c9387f..30dd943 100644
--- a/modules/web-console/frontend/app/components/page-profile/style.scss
+++ b/modules/web-console/frontend/app/components/page-profile/style.scss
@@ -16,6 +16,9 @@
*/
page-profile {
+ max-width: 800px;
+ display: block;
+
panel-collapsible {
width: 100%;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-profile/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-profile/template.pug b/modules/web-console/frontend/app/components/page-profile/template.pug
index fb95793..2ec6c90 100644
--- a/modules/web-console/frontend/app/components/page-profile/template.pug
+++ b/modules/web-console/frontend/app/components/page-profile/template.pug
@@ -24,7 +24,7 @@ div
-var form = '$ctrl.form'
form.theme--ignite(name='$ctrl.form' novalidate)
.row
- .col-25
+ .col-50
+form-field__text({
label: 'First name:',
model: '$ctrl.ui.user.firstName',
@@ -35,7 +35,7 @@ div
ignite-auto-focus
ignite-on-enter-focus-move='lastNameInput'
)
- .col-25
+ .col-50
+form-field__text({
label: 'Last name:',
model: '$ctrl.ui.user.lastName',
@@ -46,7 +46,7 @@ div
ignite-on-enter-focus-move='emailInput'
)
.row
- .col-50
+ .col-100
+form-field__email({
label: 'Email:',
model: '$ctrl.ui.user.email',
@@ -57,7 +57,7 @@ div
ignite-on-enter-focus-move='phoneInput'
)
.row
- .col-25
+ .col-50
+form-field__phone({
label: 'Phone:',
model: '$ctrl.ui.user.phone',
@@ -67,7 +67,7 @@ div
})(
ignite-on-enter-focus-move='companyInput'
)
- .col-25
+ .col-50
+form-field__dropdown({
label: 'Country:',
model: '$ctrl.ui.user.country',
@@ -77,7 +77,7 @@ div
options: '$ctrl.ui.countries'
})
.row
- .col-50
+ .col-100
+form-field__text({
label: 'Company:',
model: '$ctrl.ui.user.company',
@@ -89,7 +89,7 @@ div
)
.row#security-token-section
- .col-50
+ .col-100
panel-collapsible(
opened='$ctrl.ui.expandedToken'
on-open='$ctrl.ui.expandedToken = true'
@@ -115,7 +115,7 @@ div
a(ng-click='$ctrl.generateToken()') Generate Random Security Token?
.row
- .col-50
+ .col-100
panel-collapsible(
opened='$ctrl.ui.expandedPassword'
on-open='$ctrl.ui.expandedToken = false'
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/style.scss b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/style.scss
index 9726c6f..a5fd50a 100644
--- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/style.scss
+++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/style.scss
@@ -18,9 +18,22 @@
queries-notebook {
// TODO: Delete this breadcrumbs styles after template refactoring to new design.
.notebooks-top {
- margin-bottom: 20px;
display: flex;
align-items: center;
+ margin: 40px 0 30px;
+ flex-direction: row;
+
+ h1 {
+ margin: 0 !important;
+ display: flex;
+ align-items: center;
+ align-content: center;
+
+ label {
+ font-size: 24px;
+ margin-right: 10px;
+ }
+ }
breadcrumbs {
padding-left: 0;
@@ -36,24 +49,6 @@ queries-notebook {
}
}
- .docs-content > header {
- margin: 0;
- margin-bottom: 30px;
-
- display: flex;
- flex-direction: row;
- align-items: center;
-
- h1 {
- margin: 0;
- margin-right: 8px;
- }
- }
-
- .affix + .block-information {
- margin-top: 90px;
- }
-
.block-information {
padding: 18px 10px 18px 36px;
@@ -109,6 +104,20 @@ queries-notebook {
}
}
+ .notebook-top-buttons {
+ display: flex;
+ align-items: center;
+ margin-left: auto;
+
+ button:first-of-type {
+ margin-right: 20px;
+ }
+
+ a {
+ color: rgb(57, 57, 57);
+ }
+ }
+
.btn.btn-default.select-toggle.tipLabel {
padding-right: 25px;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
index 44bfaa5..5c16beb 100644
--- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
+++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
@@ -48,34 +48,6 @@ mixin chart-settings
.col-xs-2
+result-toolbar
-mixin notebook-rename
- .notebooks-top
- breadcrumbs
- a.link-success(ui-sref='^.') Notebooks
- span(ui-sref='.' ui-sref-active) Notebook '{{notebook.name}}'
- cluster-selector
-
- .docs-header.notebook-header
- h1.col-sm-6(ng-hide='notebook.edit')
- label(style='max-width: calc(100% - 60px)') {{notebook.name}}
- .btn-group(ng-if='!demo')
- +btn-toolbar('fa-pencil', 'notebook.edit = true;notebook.editName = notebook.name', 'Rename notebook')
- +btn-toolbar('fa-trash', 'removeNotebook(notebook)', '{{$ctrl.isDemo ? "Demo notebook cannot be deleted" : "Remove notebook"}}')
- h1.col-sm-6(ng-show='notebook.edit')
- i.btn.fa.fa-floppy-o(ng-show='notebook.editName' ng-click='renameNotebook(notebook.editName)' bs-tooltip data-title='Save notebook name' data-trigger='hover')
- .input-tip
- input.form-control(ng-model='notebook.editName' required ignite-on-enter='renameNotebook(notebook.editName)' ignite-on-escape='notebook.edit = false;')
- h1.pull-right
- a.dropdown-toggle(style='margin-right: 20px' data-toggle='dropdown' bs-dropdown='scrollParagraphs' data-placement='bottom-right') Scroll to query
- span.caret
- button.btn.btn-default(style='margin-top: 2px' ng-click='addQuery()' ignite-on-click-focus=focusId)
- i.fa.fa-fw.fa-plus
- | Add query
-
- button.btn.btn-default(style='margin-top: 2px' ng-click='addScan()' ignite-on-click-focus=focusId)
- i.fa.fa-fw.fa-plus
- | Add scan
-
mixin notebook-error
h2 Failed to load notebook
label.col-sm-12 Notebook not accessible any more. Go back to notebooks list.
@@ -287,9 +259,9 @@ mixin paragraph-scan
span.tipLabelExecute Scan
button.btn.btn-primary(ng-disabled='!scanAvailable(paragraph)' ng-click='scan(paragraph, true)')
- i.fa.fa-fw.fa-play(ng-hide='paragraph.checkScanInProgress(true)')
- i.fa.fa-fw.fa-refresh.fa-spin(ng-show='paragraph.checkScanInProgress(true)')
- span.tipLabelExecute Scan on selected node
+ i.fa.fa-fw.fa-play(ng-hide='paragraph.checkScanInProgress(true)')
+ i.fa.fa-fw.fa-refresh.fa-spin(ng-show='paragraph.checkScanInProgress(true)')
+ span.tipLabelExecute Scan on selected node
.col-sm-12.sql-result(ng-if='paragraph.queryExecuted() && !paragraph.scanningInProgress' ng-switch='paragraph.resultType()')
.error(ng-switch-when='error') Error: {{paragraph.error.message}}
@@ -369,54 +341,79 @@ mixin paragraph-query
i.fa.fa-chevron-circle-right
a Next
-.row
- .docs-content
- .row(ng-if='notebook' bs-affix style='margin-bottom: 20px;')
- +notebook-rename
-
- -var example = `CREATE TABLE Person(ID INTEGER PRIMARY KEY, NAME VARCHAR(100));\nINSERT INTO Person(ID, NAME) VALUES (1, 'Ed'), (2, 'Ann'), (3, 'Emma');\nSELECT * FROM Person;`;
-
- ignite-information(
- data-title='With query notebook you can'
- style='margin-bottom: 30px'
- ng-init=`example = "${example}"`
- )
- ul
- li Create any number of queries
- li Execute and explain SQL queries
- li Execute scan queries
- li View data in tabular form and as charts
- li
- a(href='https://apacheignite-sql.readme.io/docs/sql-reference-overview' target='_blank') More info
- .example
- .group
- .group-legend
- label Examples:
- .group-content
- .sql-editor(ignite-ace='{\
- onLoad: aceInit({}),\
- theme: "chrome",\
- mode: "sql",\
- require: ["ace/ext/language_tools"],\
- showGutter: false,\
- advanced: {\
- enableSnippets: false,\
- enableBasicAutocompletion: true,\
- enableLiveAutocompletion: true\
- }}'
- ng-model='example'
- readonly='true'
- )
-
- div(ng-if='notebookLoadFailed' style='text-align: center')
- +notebook-error
-
- div(ng-if='notebook' ignite-loading='sqlLoading' ignite-loading-text='{{ loadingText }}' ignite-loading-position='top')
- .docs-body.paragraphs
- .panel-group(bs-collapse ng-model='notebook.expandedParagraphs' data-allow-multiple='true' data-start-collapsed='false')
-
- .panel-paragraph(ng-repeat='paragraph in notebook.paragraphs' id='{{paragraph.id}}' ng-form='form_{{paragraph.id}}')
- .panel.panel-default(ng-if='paragraph.qryType === "scan"')
- +paragraph-scan
- .panel.panel-default(ng-if='paragraph.qryType === "query"')
- +paragraph-query
+div(ng-if='notebook')
+ .notebooks-top
+ h1(ng-hide='notebook.edit')
+ label {{notebook.name}}
+ .btn-group(ng-if='!demo')
+ +btn-toolbar('fa-pencil', 'notebook.edit = true;notebook.editName = notebook.name', 'Rename notebook')
+ +btn-toolbar('fa-trash', 'removeNotebook(notebook)', '{{$ctrl.isDemo ? "Demo notebook cannot be deleted" : "Remove notebook"}}')
+
+ h1(ng-show='notebook.edit')
+ input.form-control(ng-model='notebook.editName' required ignite-on-enter='renameNotebook(notebook.editName)' ignite-on-escape='notebook.edit = false;')
+ i.btn.fa.fa-floppy-o(ng-show='notebook.editName' ng-click='renameNotebook(notebook.editName)' bs-tooltip data-title='Save notebook name' data-trigger='hover')
+
+ cluster-selector
+
+ .notebook-top-buttons
+ a.dropdown-toggle(style='margin-right: 20px' data-toggle='dropdown' bs-dropdown='scrollParagraphs' data-placement='bottom-left') Scroll to query
+ span.caret
+ button.btn-ignite.btn-ignite--primary(ng-click='addQuery()' ignite-on-click-focus=focusId)
+ svg.icon-left(ignite-icon='plus')
+ | Add query
+
+ button.btn-ignite.btn-ignite--primary(ng-click='addScan()' ignite-on-click-focus=focusId)
+ svg.icon-left(ignite-icon='plus')
+ | Add scan
+
+div
+ breadcrumbs
+ a.link-success(ui-sref='^.') Notebooks
+ span(ui-sref='.' ui-sref-active) Notebook '{{notebook.name}}'
+
+ -var example = `CREATE TABLE Person(ID INTEGER PRIMARY KEY, NAME VARCHAR(100));\nINSERT INTO Person(ID, NAME) VALUES (1, 'Ed'), (2, 'Ann'), (3, 'Emma');\nSELECT * FROM Person;`;
+
+ ignite-information(
+ data-title='With query notebook you can'
+ style='margin-bottom: 30px'
+ ng-init=`example = "${example}"`
+ )
+ ul
+ li Create any number of queries
+ li Execute and explain SQL queries
+ li Execute scan queries
+ li View data in tabular form and as charts
+ li
+ a(href='https://apacheignite-sql.readme.io/docs/sql-reference-overview' target='_blank') More info
+ .example
+ .group
+ .group-legend
+ label Examples:
+ .group-content
+ .sql-editor(ignite-ace='{\
+ onLoad: aceInit({}),\
+ theme: "chrome",\
+ mode: "sql",\
+ require: ["ace/ext/language_tools"],\
+ showGutter: false,\
+ advanced: {\
+ enableSnippets: false,\
+ enableBasicAutocompletion: true,\
+ enableLiveAutocompletion: true\
+ }}'
+ ng-model='example'
+ readonly='true'
+ )
+
+ div(ng-if='notebookLoadFailed' style='text-align: center')
+ +notebook-error
+
+ div(ng-if='notebook' ignite-loading='sqlLoading' ignite-loading-text='{{ loadingText }}' ignite-loading-position='top')
+ .docs-body.paragraphs
+ .panel-group(bs-collapse ng-model='notebook.expandedParagraphs' data-allow-multiple='true' data-start-collapsed='false')
+
+ .panel-paragraph(ng-repeat='paragraph in notebook.paragraphs' id='{{paragraph.id}}' ng-form='form_{{paragraph.id}}')
+ .panel.panel-default(ng-if='paragraph.qryType === "scan"')
+ +paragraph-scan
+ .panel.panel-default(ng-if='paragraph.qryType === "query"')
+ +paragraph-query
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
index ad86a10..776fb08 100644
--- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
+++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
@@ -27,7 +27,7 @@ export class NotebooksListCtrl {
this.rowsToShow = 8;
- const notebookNameTemplate = `<div class="ui-grid-cell-contents notebook-name"><a ui-sref="base.sql.tabs.notebook({ noteId: row.entity._id })">{{ row.entity.name }}</a></div>`;
+ const notebookNameTemplate = `<div class="ui-grid-cell-contents notebook-name"><a ui-sref="base.sql.notebook({ noteId: row.entity._id })">{{ row.entity.name }}</a></div>`;
const sqlQueryTemplate = `<div class="ui-grid-cell-contents">{{row.entity.sqlQueriesParagraphsLength}}</div>`;
const scanQueryTemplate = `<div class="ui-grid-cell-contents">{{row.entity.scanQueriesPsaragraphsLength}}</div>`;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-queries/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-queries/index.js b/modules/web-console/frontend/app/components/page-queries/index.js
index 5728d8d..ab64b44 100644
--- a/modules/web-console/frontend/app/components/page-queries/index.js
+++ b/modules/web-console/frontend/app/components/page-queries/index.js
@@ -21,10 +21,6 @@ import queriesNotebooksList from './components/queries-notebooks-list';
import queriesNotebook from './components/queries-notebook';
import pageQueriesCmp from './component';
-import template from 'views/base2.pug';
-// This template is deprecated for notebooks view
-import legacyTemplate from 'views/base.pug';
-
import Notebook from './notebook.service';
export default angular.module('ignite-console.sql', [
@@ -49,11 +45,9 @@ export default angular.module('ignite-console.sql', [
}
$postLink() {
- this.$timeout(() => {
- this.$transclude((clone) => {
- this.pageQueries[this.slotName].empty();
- clone.appendTo(this.pageQueries[this.slotName]);
- });
+ this.$transclude((clone) => {
+ this.pageQueries[this.slotName].empty();
+ clone.appendTo(this.pageQueries[this.slotName]);
});
}
},
@@ -64,15 +58,7 @@ export default angular.module('ignite-console.sql', [
// set up the states
$stateProvider
.state('base.sql', {
- abstract: true,
- views: {
- '@': {
- template
- },
- '@base.sql': {
- template: '<ui-view></ui-view>'
- }
- }
+ abstract: true
})
.state('base.sql.tabs', {
url: '/queries',
@@ -88,16 +74,9 @@ export default angular.module('ignite-console.sql', [
title: 'Notebooks'
}
})
- .state('base.sql.tabs.notebook', {
+ .state('base.sql.notebook', {
url: '/notebook/{noteId}',
- views: {
- '@': {
- template: legacyTemplate
- },
- '@base.sql.tabs.notebook': {
- component: 'queriesNotebook'
- }
- },
+ component: 'queriesNotebook',
permission: 'query',
tfMetaTags: {
title: 'Query notebook'
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-signin/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-signin/template.pug b/modules/web-console/frontend/app/components/page-signin/template.pug
index 6047e65..b31a9bd 100644
--- a/modules/web-console/frontend/app/components/page-signin/template.pug
+++ b/modules/web-console/frontend/app/components/page-signin/template.pug
@@ -20,7 +20,7 @@ web-console-header
web-console-header-left
ignite-header-title
-.container.body-container
+.container--responsive.body-container
section
-var form = '$ctrl.form'
h3 Sign In
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/page-signup/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-signup/template.pug b/modules/web-console/frontend/app/components/page-signup/template.pug
index 254243e..11bb50a 100644
--- a/modules/web-console/frontend/app/components/page-signup/template.pug
+++ b/modules/web-console/frontend/app/components/page-signup/template.pug
@@ -20,7 +20,7 @@ web-console-header
web-console-header-left
ignite-header-title
-.container.body-container
+.container--responsive.body-container
section
-var form = '$ctrl.form'
h3 Don't Have An Account?
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/web-console-footer/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-footer/template.pug b/modules/web-console/frontend/app/components/web-console-footer/template.pug
index e7eecf5..aa2812a 100644
--- a/modules/web-console/frontend/app/components/web-console-footer/template.pug
+++ b/modules/web-console/frontend/app/components/web-console-footer/template.pug
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-.container.wcf-content
+.container--responsive.wcf-content
ignite-footer
web-console-footer-links(ng-if='$parent.user')
ignite-powered-by-apache
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/web-console-header/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-header/style.scss b/modules/web-console/frontend/app/components/web-console-header/style.scss
index 8f92d8a..e92fdd5 100644
--- a/modules/web-console/frontend/app/components/web-console-header/style.scss
+++ b/modules/web-console/frontend/app/components/web-console-header/style.scss
@@ -64,8 +64,9 @@ web-console-header {
flex-direction: row;
flex-wrap: wrap;
align-items: center;
- padding: 18.5px 0;
+ padding: 18px 30px;
position: relative;
+ height: 81px;
}
.wch-logo {
@@ -191,6 +192,10 @@ web-console-header {
}
}
}
+
+ .wch-additional-nav-items {
+ display: flex;
+ }
}
@keyframes pulse {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/components/web-console-header/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-header/template.pug b/modules/web-console/frontend/app/components/web-console-header/template.pug
index a05e5f8..801b742 100644
--- a/modules/web-console/frontend/app/components/web-console-header/template.pug
+++ b/modules/web-console/frontend/app/components/web-console-header/template.pug
@@ -20,10 +20,10 @@
| You are currently viewing user #[strong {{$root.user.firstName}} {{$root.user.lastName}}] as administrator. #[a(ng-click='$root.revertIdentity()') Revert to your identity?]
.wch-notification.wch-notification--demo(ng-if='$root.IgniteDemoMode')
- .container(ng-controller='demoController')
+ div(ng-controller='demoController')
| You are now in #[b Demo Mode]. #[a(ng-click='closeDemo();') Close Demo?]
-.wch-content.container
+.wch-content
connected-clusters(ng-if='$ctrl.$rootScope.user && !$ctrl.$rootScope.IgniteDemoMode && $ctrl.isConnectedClustersVisible && !$root.user.becomeUsed')
a(ui-sref='landing')
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/modules/states/admin.state.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/admin.state.js b/modules/web-console/frontend/app/modules/states/admin.state.js
index 208cd2c..f45421a 100644
--- a/modules/web-console/frontend/app/modules/states/admin.state.js
+++ b/modules/web-console/frontend/app/modules/states/admin.state.js
@@ -17,8 +17,6 @@
import angular from 'angular';
-import template from 'views/base2.pug';
-
angular
.module('ignite-console.states.admin', [
'ui.router'
@@ -28,15 +26,7 @@ angular
$stateProvider
.state('base.settings.admin', {
url: '/admin',
- views: {
- '@': {
- template
- },
- '@base.settings.admin': {
- template: '<page-admin></page-admin>'
- }
- },
- // templateUrl,
+ component: 'pageAdmin',
permission: 'admin_page',
tfMetaTags: {
title: 'Admin panel'
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/modules/states/settings.state.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/settings.state.js b/modules/web-console/frontend/app/modules/states/settings.state.js
new file mode 100644
index 0000000..1651376
--- /dev/null
+++ b/modules/web-console/frontend/app/modules/states/settings.state.js
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+
+import angular from 'angular';
+
+angular
+ .module('ignite-console.states.settings', [
+ 'ui.router'
+ ])
+ .config(['$stateProvider', function($stateProvider) {
+ // Set up the states.
+ $stateProvider
+ .state('base.settings', {
+ url: '/settings',
+ abstract: true,
+ template: '<ui-view></ui-view>'
+ });
+ }]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/primitives/badge/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/badge/index.scss b/modules/web-console/frontend/app/primitives/badge/index.scss
index 79082e0..96d6b54 100644
--- a/modules/web-console/frontend/app/primitives/badge/index.scss
+++ b/modules/web-console/frontend/app/primitives/badge/index.scss
@@ -22,7 +22,7 @@
min-width: 26px;
height: 18px;
- padding: 2px 9px;
+ padding: 3px 9px;
border-radius: 9px;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/app/primitives/btn/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/btn/index.scss b/modules/web-console/frontend/app/primitives/btn/index.scss
index 061d411..2d9e9c4 100644
--- a/modules/web-console/frontend/app/primitives/btn/index.scss
+++ b/modules/web-console/frontend/app/primitives/btn/index.scss
@@ -90,6 +90,11 @@ $btn-content-padding-with-border: 9px 11px;
-webkit-pointer-events: none;
pointer-events: none;
}
+
+ [ignite-icon='plus'] {
+ height: 12px;
+ width: 12px;
+ }
}
.btn-ignite--primary {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/stylesheets/style.scss b/modules/web-console/frontend/public/stylesheets/style.scss
index 4d510d4..3d921df 100644
--- a/modules/web-console/frontend/public/stylesheets/style.scss
+++ b/modules/web-console/frontend/public/stylesheets/style.scss
@@ -33,6 +33,14 @@ body {
flex: 1 0 auto;
}
+.container--responsive {
+ padding: 0 30px;
+
+ .gridster-wrapper {
+ margin: -20px !important;
+ }
+}
+
hr {
margin: 20px 0;
}
@@ -62,7 +70,7 @@ hr {
}
.table.table-vertical-middle tbody > tr > td {
- vertical-align: middle;
+ vertical-align: middle;
}
.table .ui-grid-settings {
@@ -95,7 +103,7 @@ hr {
}
.tooltip {
- word-wrap: break-word;
+ word-wrap: break-word;
}
.theme-line ul.dropdown-menu {
@@ -288,10 +296,6 @@ body > .wrapper > ui-view {
.use-cache {
display: flex;
-
- input[type="checkbox"] {
- flex: 1 0 auto;
- }
}
.group-section {
@@ -1387,8 +1391,8 @@ th[st-sort] {
// element a background, we're telling Safari that it *really* needs to
// paint the whole area. See https://github.com/ajaxorg/ace/issues/2872
.ace_scrollbar-inner {
- background-color: #FFF;
- opacity: 0.01;
+ background-color: #FFF;
+ opacity: 0.01;
.ace_dark & {
background-color: #000;
@@ -1879,7 +1883,7 @@ treecontrol.tree-classic {
.ribbon {
position: absolute;
top: 42px;
- width: 200px;
+ width: 186px;
padding: 1px 0;
color: $btn-primary-color;
background: $btn-primary-border;
@@ -1892,16 +1896,15 @@ treecontrol.tree-classic {
transform: rotate(45deg);
> label {
- display: block;
padding: 1px 0;
- height: 24px;
- line-height: 18px;
-
+ height: 17px;
+ line-height: 12px;
text-align: center;
text-decoration: none;
- font-family: $font-family-sans-serif;
- font-size: 20px;
- font-weight: 500;
+ font-family: Roboto, sans-serif;
+ font-size: 16px;
+ display: block;
+ font-weight: 400;
border: 1px solid rgba(255,255,255,0.3);
@@ -1951,10 +1954,10 @@ html, body {
}
.splash:before {
- content: '';
- display: inline-block;
- height: 100%;
- vertical-align: middle;
+ content: '';
+ display: inline-block;
+ height: 100%;
+ vertical-align: middle;
}
.spinner {
@@ -2090,15 +2093,31 @@ header.header-with-selector {
div {
display: flex;
- }
- .btn-ignite + .btn-ignite-group {
- position: relative;
- margin-left: 20px;
+ &:nth-child(2) {
+ .btn-ignite {
+ margin-left: 20px;
+ }
+
+ .btn-ignite-group {
+ .btn-ignite {
+ margin-left: 0;
+ }
+ }
- ul.dropdown-menu {
- min-width: 100%;
- font-family: Roboto;
+ .btn-ignite + .btn-ignite-group {
+ position: relative;
+ margin-left: 20px;
+
+ button {
+ margin-left: 0;
+ }
+
+ ul.dropdown-menu {
+ min-width: 100%;
+ font-family: Roboto;
+ }
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/views/403.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/403.tpl.pug b/modules/web-console/frontend/views/403.tpl.pug
index 7d65442..491ff6b 100644
--- a/modules/web-console/frontend/views/403.tpl.pug
+++ b/modules/web-console/frontend/views/403.tpl.pug
@@ -16,7 +16,7 @@
web-console-header
-.container.body-container
+.container--responsive.body-container
.error-page
h1.error-page__title 403
h2.error-page__description You are not authorized
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/views/404.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/404.tpl.pug b/modules/web-console/frontend/views/404.tpl.pug
index c4cef12..d9a0795 100644
--- a/modules/web-console/frontend/views/404.tpl.pug
+++ b/modules/web-console/frontend/views/404.tpl.pug
@@ -16,7 +16,7 @@
web-console-header
-.container.body-container
+.container--responsive.body-container
.error-page
h1.error-page__title 404
h2.error-page__description Page not found
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/views/base.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/base.pug b/modules/web-console/frontend/views/base.pug
index 525e762..967d469 100644
--- a/modules/web-console/frontend/views/base.pug
+++ b/modules/web-console/frontend/views/base.pug
@@ -20,7 +20,7 @@ web-console-header
web-console-header-right
include ./includes/header-right
-.container.body-container
- .main-content(ui-view='')
+.container--responsive.body-container.flex-full-height
+ div(ui-view='').flex-full-height
web-console-footer
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/views/base2.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/base2.pug b/modules/web-console/frontend/views/base2.pug
deleted file mode 100644
index 22028d5..0000000
--- a/modules/web-console/frontend/views/base2.pug
+++ /dev/null
@@ -1,26 +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.
-
-web-console-header
- web-console-header-left
- include ./includes/header-left
- web-console-header-right
- include ./includes/header-right
-
-.container.body-container.flex-full-height
- div(ui-view='').flex-full-height
-
-web-console-footer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/views/includes/header-left.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/includes/header-left.pug b/modules/web-console/frontend/views/includes/header-left.pug
index 2052bbc..bf1ee9b 100644
--- a/modules/web-console/frontend/views/includes/header-left.pug
+++ b/modules/web-console/frontend/views/includes/header-left.pug
@@ -24,7 +24,7 @@ a.wch-nav-item(
a(ui-sref='base.sql.tabs' ui-sref-active='active')
| Queries
-.wch-content(ignite-navbar)
+.wch-additional-nav-items(ignite-navbar)
.wch-nav-item(ng-repeat='item in navbar.items')
div(ng-if='$root.user.becomeUsed ? item.canBecomed : item.children' ng-click='$event.stopPropagation()'
ng-class='{active: $state.includes(item.sref)}'
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/views/includes/header-right.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/includes/header-right.pug b/modules/web-console/frontend/views/includes/header-right.pug
index 2255275..d2d89aa 100644
--- a/modules/web-console/frontend/views/includes/header-right.pug
+++ b/modules/web-console/frontend/views/includes/header-right.pug
@@ -27,7 +27,7 @@ web-console-header-extension
ng-class='{active: $state.includes("base.settings")}'
ng-click='$event.stopPropagation()'
bs-dropdown='userbar.items'
- data-placement='bottom-left'
+ data-placement='bottom-right'
data-trigger='hover focus'
data-container='self'
)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac62e614/modules/web-console/frontend/webpack/webpack.common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/webpack/webpack.common.js b/modules/web-console/frontend/webpack/webpack.common.js
index b52d5e0..b758b4b 100644
--- a/modules/web-console/frontend/webpack/webpack.common.js
+++ b/modules/web-console/frontend/webpack/webpack.common.js
@@ -129,7 +129,7 @@ const config = {
{
test: /^(?:(?!url\.svg$).)*\.svg$/,
include: [contentBase],
- use: ['svg-sprite-loader']
+ loader: 'svg-sprite-loader'
},
{
test: /.*\.url\.svg$/,
[14/18] ignite git commit: IGNITE-9070 Web Console: Fixed issue with
notifications from Admin panel.
Posted by sb...@apache.org.
IGNITE-9070 Web Console: Fixed issue with notifications from Admin panel.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0bbb8a6c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0bbb8a6c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0bbb8a6c
Branch: refs/heads/ignite-6467-1
Commit: 0bbb8a6c063c63482fea2ee0c706c76308f51a48
Parents: 2b6e556
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Jul 25 00:32:58 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Jul 25 00:32:58 2018 +0700
----------------------------------------------------------------------
modules/web-console/backend/middlewares/api.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bbb8a6c/modules/web-console/backend/middlewares/api.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/middlewares/api.js b/modules/web-console/backend/middlewares/api.js
index 9fe9373..27e130d 100644
--- a/modules/web-console/backend/middlewares/api.js
+++ b/modules/web-console/backend/middlewares/api.js
@@ -48,7 +48,7 @@ module.exports.factory = () => {
},
done() {
- res.status(200).send({res: true});
+ res.sendStatus(200);
}
};
[12/18] ignite git commit: IGNITE-9057 Update JCraft dependency
version in Apache Ignite - Fixes #4417.
Posted by sb...@apache.org.
IGNITE-9057 Update JCraft dependency version in Apache Ignite - Fixes #4417.
Signed-off-by: Dmitriy Pavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/53a58bce
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53a58bce
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53a58bce
Branch: refs/heads/ignite-6467-1
Commit: 53a58bcead3c9f43a8b8bc55aea9a1901572e5cf
Parents: 4abd1f3
Author: Dmitrii Ryabov <So...@gmail.com>
Authored: Tue Jul 24 20:08:22 2018 +0300
Committer: Dmitriy Pavlov <dp...@apache.org>
Committed: Tue Jul 24 20:08:22 2018 +0300
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/53a58bce/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6b7862e..3509d44 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -84,8 +84,8 @@
<jetty.version>9.2.11.v20150529</jetty.version>
<jmh.version>1.13</jmh.version>
<jms.spec.version>1.1.1</jms.spec.version>
- <jsch.bundle.version>0.1.53_1</jsch.bundle.version>
- <jsch.version>0.1.53</jsch.version>
+ <jsch.bundle.version>0.1.54_1</jsch.bundle.version>
+ <jsch.version>0.1.54</jsch.version>
<jsonlib.bundle.version>2.4_1</jsonlib.bundle.version>
<jsonlib.version>2.4</jsonlib.version>
<jtidy.version>r938</jtidy.version>