Author: tommaso
Date: Sun Jun 15 06:05:34 2014
New Revision: 1602661
URL: http://svn.apache.org/r1602661
Log:
fixed imports / format
Modified:
labs/yay/trunk/api/src/main/java/org/apache/yay/NeuralNetwork.java
labs/yay/trunk/api/src/main/java/org/apache/yay/PredictionException.java
labs/yay/trunk/api/src/main/java/org/apache/yay/PredictionStrategy.java
labs/yay/trunk/api/src/main/java/org/apache/yay/TrainingSet.java
labs/yay/trunk/core/src/main/java/org/apache/yay/core/BackPropagationLearningStrategy.java
labs/yay/trunk/core/src/main/java/org/apache/yay/core/BasicPerceptron.java
labs/yay/trunk/core/src/main/java/org/apache/yay/core/FeedForwardStrategy.java
labs/yay/trunk/core/src/main/java/org/apache/yay/core/MaxSelectionFunction.java
labs/yay/trunk/core/src/main/java/org/apache/yay/core/NeuralNetworkFactory.java
labs/yay/trunk/core/src/main/java/org/apache/yay/core/VoidLearningStrategy.java
labs/yay/trunk/core/src/main/java/org/apache/yay/core/utils/ConversionUtils.java
labs/yay/trunk/core/src/main/java/org/apache/yay/core/utils/ExamplesFactory.java
labs/yay/trunk/core/src/test/java/org/apache/yay/core/BackPropagationLearningStrategyTest.java
labs/yay/trunk/core/src/test/java/org/apache/yay/core/BasicPerceptronTest.java
labs/yay/trunk/core/src/test/java/org/apache/yay/core/FeedForwardStrategyTest.java
labs/yay/trunk/core/src/test/java/org/apache/yay/core/LogisticRegressionCostFunctionTest.java
labs/yay/trunk/core/src/test/java/org/apache/yay/core/NeuralNetworkFactoryTest.java
labs/yay/trunk/core/src/test/java/org/apache/yay/core/SigmoidFunctionTest.java
labs/yay/trunk/core/src/test/java/org/apache/yay/core/VoidLearningStrategyTest.java
Modified: labs/yay/trunk/api/src/main/java/org/apache/yay/NeuralNetwork.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/api/src/main/java/org/apache/yay/NeuralNetwork.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
--- labs/yay/trunk/api/src/main/java/org/apache/yay/NeuralNetwork.java
(original)
+++ labs/yay/trunk/api/src/main/java/org/apache/yay/NeuralNetwork.java Sun Jun
15 06:05:34 2014
@@ -23,6 +23,6 @@ import org.apache.commons.math3.linear.R
/**
* A neural network is a layered connected graph of elaboration units
*/
-public interface NeuralNetwork extends Hypothesis<RealMatrix, Double, Double>{
+public interface NeuralNetwork extends Hypothesis<RealMatrix, Double, Double> {
}
Modified:
labs/yay/trunk/api/src/main/java/org/apache/yay/PredictionException.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/api/src/main/java/org/apache/yay/PredictionException.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
--- labs/yay/trunk/api/src/main/java/org/apache/yay/PredictionException.java
(original)
+++ labs/yay/trunk/api/src/main/java/org/apache/yay/PredictionException.java
Sun Jun 15 06:05:34 2014
@@ -19,7 +19,7 @@
package org.apache.yay;
/**
- * Exception thrown when an error occurs when a neural network is trying to
+ * Exception thrown when an error occurs when a neural network is trying to
* predict an output for a given input
*/
@SuppressWarnings("serial")
Modified:
labs/yay/trunk/api/src/main/java/org/apache/yay/PredictionStrategy.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/api/src/main/java/org/apache/yay/PredictionStrategy.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
--- labs/yay/trunk/api/src/main/java/org/apache/yay/PredictionStrategy.java
(original)
+++ labs/yay/trunk/api/src/main/java/org/apache/yay/PredictionStrategy.java Sun
Jun 15 06:05:34 2014
@@ -18,11 +18,10 @@
*/
package org.apache.yay;
+import java.util.Collection;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.linear.RealVector;
-import java.util.Collection;
-
/**
* A {@link PredictionStrategy} defines an algorithm for the prediction of
outputs
* of type <code>O</code> given inputs of type <code>I</code>.
Modified: labs/yay/trunk/api/src/main/java/org/apache/yay/TrainingSet.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/api/src/main/java/org/apache/yay/TrainingSet.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
--- labs/yay/trunk/api/src/main/java/org/apache/yay/TrainingSet.java (original)
+++ labs/yay/trunk/api/src/main/java/org/apache/yay/TrainingSet.java Sun Jun 15
06:05:34 2014
@@ -26,18 +26,18 @@ import java.util.Iterator;
*/
public class TrainingSet<F, O> implements Iterable<TrainingExample<F, O>> {
- private Collection<TrainingExample<F, O>> samples;
+ private Collection<TrainingExample<F, O>> samples;
- public TrainingSet(Collection<TrainingExample<F, O>> samples) {
- this.samples = samples;
- }
+ public TrainingSet(Collection<TrainingExample<F, O>> samples) {
+ this.samples = samples;
+ }
- @Override
- public Iterator<TrainingExample<F, O>> iterator() {
- return samples.iterator();
- }
+ @Override
+ public Iterator<TrainingExample<F, O>> iterator() {
+ return samples.iterator();
+ }
- public int size() {
- return samples.size();
- }
+ public int size() {
+ return samples.size();
+ }
}
Modified:
labs/yay/trunk/core/src/main/java/org/apache/yay/core/BackPropagationLearningStrategy.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/core/BackPropagationLearningStrategy.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/main/java/org/apache/yay/core/BackPropagationLearningStrategy.java
(original)
+++
labs/yay/trunk/core/src/main/java/org/apache/yay/core/BackPropagationLearningStrategy.java
Sun Jun 15 06:05:34 2014
@@ -18,15 +18,20 @@
*/
package org.apache.yay.core;
+import java.util.Arrays;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.ArrayRealVector;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.linear.RealVector;
-import org.apache.yay.*;
+import org.apache.yay.CostFunction;
+import org.apache.yay.LearningStrategy;
+import org.apache.yay.NeuralNetwork;
+import org.apache.yay.PredictionStrategy;
+import org.apache.yay.TrainingExample;
+import org.apache.yay.TrainingSet;
+import org.apache.yay.WeightLearningException;
import org.apache.yay.core.utils.ConversionUtils;
-import java.util.Arrays;
-
/**
* Back propagation learning algorithm for neural networks implementation (see
* <code>http://en.wikipedia.org/wiki/Backpropagation</code>).
Modified:
labs/yay/trunk/core/src/main/java/org/apache/yay/core/BasicPerceptron.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/core/BasicPerceptron.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
--- labs/yay/trunk/core/src/main/java/org/apache/yay/core/BasicPerceptron.java
(original)
+++ labs/yay/trunk/core/src/main/java/org/apache/yay/core/BasicPerceptron.java
Sun Jun 15 06:05:34 2014
@@ -18,6 +18,7 @@
*/
package org.apache.yay.core;
+import java.util.Collection;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.yay.Input;
@@ -29,8 +30,6 @@ import org.apache.yay.TrainingSet;
import org.apache.yay.core.neuron.BinaryThresholdNeuron;
import org.apache.yay.core.utils.ConversionUtils;
-import java.util.Collection;
-
/**
* A perceptron {@link org.apache.yay.NeuralNetwork} implementation based on
* {@link org.apache.yay.core.neuron.BinaryThresholdNeuron}s
@@ -55,7 +54,7 @@ public class BasicPerceptron implements
@Override
public void learn(TrainingSet<Double, Double> trainingExamples) throws
LearningException {
for (TrainingExample<Double, Double> example : trainingExamples) {
- learn(example);
+ learn(example);
}
}
Modified:
labs/yay/trunk/core/src/main/java/org/apache/yay/core/FeedForwardStrategy.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/core/FeedForwardStrategy.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/main/java/org/apache/yay/core/FeedForwardStrategy.java
(original)
+++
labs/yay/trunk/core/src/main/java/org/apache/yay/core/FeedForwardStrategy.java
Sun Jun 15 06:05:34 2014
@@ -21,7 +21,6 @@ package org.apache.yay.core;
import java.util.ArrayList;
import java.util.Collection;
-
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Transformer;
import org.apache.commons.math3.linear.ArrayRealVector;
Modified:
labs/yay/trunk/core/src/main/java/org/apache/yay/core/MaxSelectionFunction.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/core/MaxSelectionFunction.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/main/java/org/apache/yay/core/MaxSelectionFunction.java
(original)
+++
labs/yay/trunk/core/src/main/java/org/apache/yay/core/MaxSelectionFunction.java
Sun Jun 15 06:05:34 2014
@@ -20,7 +20,6 @@ package org.apache.yay.core;
import java.util.Collection;
import java.util.Collections;
-
import org.apache.yay.SelectionFunction;
/**
Modified:
labs/yay/trunk/core/src/main/java/org/apache/yay/core/NeuralNetworkFactory.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/core/NeuralNetworkFactory.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/main/java/org/apache/yay/core/NeuralNetworkFactory.java
(original)
+++
labs/yay/trunk/core/src/main/java/org/apache/yay/core/NeuralNetworkFactory.java
Sun Jun 15 06:05:34 2014
@@ -18,6 +18,8 @@
*/
package org.apache.yay.core;
+import java.util.Arrays;
+import java.util.Collection;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.yay.CreationException;
import org.apache.yay.Input;
@@ -31,9 +33,6 @@ import org.apache.yay.TrainingSet;
import org.apache.yay.WeightLearningException;
import org.apache.yay.core.utils.ConversionUtils;
-import java.util.Arrays;
-import java.util.Collection;
-
/**
* Factory class for creating {@link org.apache.yay.NeuralNetwork}s
*/
@@ -50,8 +49,8 @@ public class NeuralNetworkFactory {
* @throws org.apache.yay.CreationException
*/
public static NeuralNetwork create(final RealMatrix[] realMatrixSet, final
LearningStrategy<Double, Double> learningStrategy,
- final
PredictionStrategy<Double, Double> predictionStrategy,
- final
SelectionFunction<Collection<Double>, Double> selectionFunction) throws
CreationException {
+ final PredictionStrategy<Double, Double>
predictionStrategy,
+ final
SelectionFunction<Collection<Double>, Double> selectionFunction) throws
CreationException {
return new NeuralNetwork() {
private RealMatrix[] updatedRealMatrixSet = realMatrixSet;
Modified:
labs/yay/trunk/core/src/main/java/org/apache/yay/core/VoidLearningStrategy.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/core/VoidLearningStrategy.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/main/java/org/apache/yay/core/VoidLearningStrategy.java
(original)
+++
labs/yay/trunk/core/src/main/java/org/apache/yay/core/VoidLearningStrategy.java
Sun Jun 15 06:05:34 2014
@@ -23,8 +23,6 @@ import org.apache.yay.LearningStrategy;
import org.apache.yay.TrainingSet;
import org.apache.yay.WeightLearningException;
-import java.util.Collection;
-
/**
* A NOP {@link org.apache.yay.LearningStrategy}
*/
Modified:
labs/yay/trunk/core/src/main/java/org/apache/yay/core/utils/ConversionUtils.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/core/utils/ConversionUtils.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/main/java/org/apache/yay/core/utils/ConversionUtils.java
(original)
+++
labs/yay/trunk/core/src/main/java/org/apache/yay/core/utils/ConversionUtils.java
Sun Jun 15 06:05:34 2014
@@ -18,15 +18,14 @@
*/
package org.apache.yay.core.utils;
+import java.util.ArrayList;
+import java.util.Collection;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.OpenMapRealVector;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.linear.RealVector;
-import org.apache.yay.Input;
import org.apache.yay.Feature;
-
-import java.util.ArrayList;
-import java.util.Collection;
+import org.apache.yay.Input;
/**
* Temporary class for conversion between model objects and commons-math
matrices/vectors
Modified:
labs/yay/trunk/core/src/main/java/org/apache/yay/core/utils/ExamplesFactory.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/core/utils/ExamplesFactory.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/main/java/org/apache/yay/core/utils/ExamplesFactory.java
(original)
+++
labs/yay/trunk/core/src/main/java/org/apache/yay/core/utils/ExamplesFactory.java
Sun Jun 15 06:05:34 2014
@@ -18,12 +18,11 @@
*/
package org.apache.yay.core.utils;
-import org.apache.yay.Input;
+import java.util.ArrayList;
import org.apache.yay.Feature;
+import org.apache.yay.Input;
import org.apache.yay.TrainingExample;
-import java.util.ArrayList;
-
/**
* Factory class for {@link org.apache.yay.Input}s and {@link
TrainingExample}s.
*/
Modified:
labs/yay/trunk/core/src/test/java/org/apache/yay/core/BackPropagationLearningStrategyTest.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/test/java/org/apache/yay/core/BackPropagationLearningStrategyTest.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/test/java/org/apache/yay/core/BackPropagationLearningStrategyTest.java
(original)
+++
labs/yay/trunk/core/src/test/java/org/apache/yay/core/BackPropagationLearningStrategyTest.java
Sun Jun 15 06:05:34 2014
@@ -21,7 +21,6 @@ package org.apache.yay.core;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Random;
-
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.yay.PredictionStrategy;
@@ -82,8 +81,7 @@ public class BackPropagationLearningStra
int cols;
if (i == 0) {
cols = (Math.abs(r.nextInt()) % 4) + 2;
- }
- else {
+ } else {
cols = initialWeights[i - 1].getRowDimension();
if (i == weightsCount - 1) {
rows = 1;
@@ -94,12 +92,10 @@ public class BackPropagationLearningStra
if (i == weightsCount - 1) {
if (c == 0) {
d[0][c] = 1d;
- }
- else {
+ } else {
d[0][c] = r.nextDouble();
}
- }
- else {
+ } else {
d[0][c] = 0;
}
}
@@ -109,8 +105,7 @@ public class BackPropagationLearningStra
double val;
if (j == 0) {
val = 1d;
- }
- else {
+ } else {
val = r.nextDouble();
}
d[k][j] = val;
@@ -119,7 +114,7 @@ public class BackPropagationLearningStra
initialWeights[i] = new Array2DRowRealMatrix(d);
}
return initialWeights;
-}
+ }
@Test
public void testLearningWithDefaultSettingsAndRandomSamples() throws
Exception {
Modified:
labs/yay/trunk/core/src/test/java/org/apache/yay/core/BasicPerceptronTest.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/test/java/org/apache/yay/core/BasicPerceptronTest.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/test/java/org/apache/yay/core/BasicPerceptronTest.java
(original)
+++
labs/yay/trunk/core/src/test/java/org/apache/yay/core/BasicPerceptronTest.java
Sun Jun 15 06:05:34 2014
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedList;
import java.util.Random;
-
import org.apache.yay.Feature;
import org.apache.yay.TrainingExample;
import org.apache.yay.TrainingSet;
@@ -42,24 +41,24 @@ public class BasicPerceptronTest {
@Before
public void setUp() throws Exception {
- Collection<TrainingExample<Double, Double>> samples = new
LinkedList<TrainingExample<Double, Double>>() ;
+ Collection<TrainingExample<Double, Double>> samples = new
LinkedList<TrainingExample<Double, Double>>();
samples.add(createTrainingExample(1d, 4d, 5d, 6d));
samples.add(createTrainingExample(1d, 5d, 6d, 0.5d));
samples.add(createTrainingExample(0.1d, 9d, 4d, 1.9d));
samples.add(createTrainingExample(0.11d, 4d, 2.6d, 9.5d));
- smallDataset = new TrainingSet<Double,Double>(samples);
+ smallDataset = new TrainingSet<Double, Double>(samples);
- Collection<TrainingExample<Double, Double>> samples1 = new
LinkedList<TrainingExample<Double, Double>>() ;
+ Collection<TrainingExample<Double, Double>> samples1 = new
LinkedList<TrainingExample<Double, Double>>();
Random r = new Random();
for (int i = 0; i < 100000; i++) {
- samples1.add(createTrainingExample(1d, r.nextDouble(),
- r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
- r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
- r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
- r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
- r.nextDouble(), r.nextDouble()));
+ samples1.add(createTrainingExample(1d, r.nextDouble(),
+ r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
+ r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
+ r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
+ r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
+ r.nextDouble(), r.nextDouble()));
}
- bigDataset = new TrainingSet<Double,Double>(samples1);
+ bigDataset = new TrainingSet<Double, Double>(samples1);
}
@@ -115,21 +114,21 @@ public class BasicPerceptronTest {
assertTrue(secondOutput == 0d || secondOutput == 1d);
}
- private TrainingExample<Double, Double> createInput(Random r) {
- return createTrainingExample(null, 1d,
- r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
- r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
- r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
- r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
- r.nextDouble(), r.nextDouble());
- }
+ private TrainingExample<Double, Double> createInput(Random r) {
+ return createTrainingExample(null, 1d,
+ r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
+ r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
+ r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
+ r.nextDouble(), r.nextDouble(), r.nextDouble(), r.nextDouble(),
+ r.nextDouble(), r.nextDouble());
+ }
- @Test
+ @Test
@SuppressWarnings("unchecked")
public void testLearnPhaseWithSmallDataset() throws Exception {
BasicPerceptron basicPerceptron = new BasicPerceptron(1d, 2d, 3d, 4d);
basicPerceptron.learn(smallDataset);
-}
+ }
@Test
@SuppressWarnings("unchecked")
Modified:
labs/yay/trunk/core/src/test/java/org/apache/yay/core/FeedForwardStrategyTest.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/test/java/org/apache/yay/core/FeedForwardStrategyTest.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/test/java/org/apache/yay/core/FeedForwardStrategyTest.java
(original)
+++
labs/yay/trunk/core/src/test/java/org/apache/yay/core/FeedForwardStrategyTest.java
Sun Jun 15 06:05:34 2014
@@ -20,7 +20,6 @@ package org.apache.yay.core;
import java.util.Collection;
import java.util.LinkedList;
-
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.linear.RealVector;
@@ -38,7 +37,7 @@ public class FeedForwardStrategyTest {
FeedForwardStrategy feedForwardStrategy = new FeedForwardStrategy(new
SigmoidFunction());
RealMatrix[] weights = new RealMatrix[2];
weights[0] = new Array2DRowRealMatrix(new double[][]{{1d, 1d, 2d, 3d},
{1d, 1d, 2d, 3d}, {1d, 1d, 2d, 3d}});
- weights[1] = new Array2DRowRealMatrix(new double[][]{{1d, 2d, 3d}});
+ weights[1] = new Array2DRowRealMatrix(new double[][]{{1d, 2d, 3d}});
Collection<Double> inputs = new LinkedList<Double>();
inputs.add(1d);
Modified:
labs/yay/trunk/core/src/test/java/org/apache/yay/core/LogisticRegressionCostFunctionTest.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/test/java/org/apache/yay/core/LogisticRegressionCostFunctionTest.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/test/java/org/apache/yay/core/LogisticRegressionCostFunctionTest.java
(original)
+++
labs/yay/trunk/core/src/test/java/org/apache/yay/core/LogisticRegressionCostFunctionTest.java
Sun Jun 15 06:05:34 2014
@@ -18,6 +18,8 @@
*/
package org.apache.yay.core;
+import java.util.Collection;
+import java.util.LinkedList;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.yay.CostFunction;
@@ -28,9 +30,6 @@ import org.apache.yay.core.utils.Example
import org.junit.Before;
import org.junit.Test;
-import java.util.Collection;
-import java.util.LinkedList;
-
import static org.junit.Assert.assertTrue;
/**
@@ -66,7 +65,7 @@ public class LogisticRegressionCostFunct
final NeuralNetwork neuralNetwork =
NeuralNetworkFactory.create(orWeightsMatrixSet,
new VoidLearningStrategy<Double, Double>(), new
FeedForwardStrategy(
- new SigmoidFunction()), new MaxSelectionFunction<Double>());
+ new SigmoidFunction()), new
MaxSelectionFunction<Double>());
Double cost = costFunction.calculateAggregatedCost(trainingSet,
neuralNetwork);
assertTrue("cost should not be negative", cost > 0d);
Modified:
labs/yay/trunk/core/src/test/java/org/apache/yay/core/NeuralNetworkFactoryTest.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/test/java/org/apache/yay/core/NeuralNetworkFactoryTest.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/test/java/org/apache/yay/core/NeuralNetworkFactoryTest.java
(original)
+++
labs/yay/trunk/core/src/test/java/org/apache/yay/core/NeuralNetworkFactoryTest.java
Sun Jun 15 06:05:34 2014
@@ -18,21 +18,15 @@
*/
package org.apache.yay.core;
+import java.util.ArrayList;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.yay.CreationException;
import org.apache.yay.Feature;
import org.apache.yay.Input;
import org.apache.yay.NeuralNetwork;
-import org.apache.yay.core.FeedForwardStrategy;
-import org.apache.yay.core.MaxSelectionFunction;
-import org.apache.yay.core.NeuralNetworkFactory;
-import org.apache.yay.core.SigmoidFunction;
-import org.apache.yay.core.VoidLearningStrategy;
import org.junit.Test;
-import java.util.ArrayList;
-
import static org.junit.Assert.assertEquals;
/**
Modified:
labs/yay/trunk/core/src/test/java/org/apache/yay/core/SigmoidFunctionTest.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/test/java/org/apache/yay/core/SigmoidFunctionTest.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/test/java/org/apache/yay/core/SigmoidFunctionTest.java
(original)
+++
labs/yay/trunk/core/src/test/java/org/apache/yay/core/SigmoidFunctionTest.java
Sun Jun 15 06:05:34 2014
@@ -18,7 +18,6 @@
*/
package org.apache.yay.core;
-import org.apache.yay.core.SigmoidFunction;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
Modified:
labs/yay/trunk/core/src/test/java/org/apache/yay/core/VoidLearningStrategyTest.java
URL:
http://svn.apache.org/viewvc/labs/yay/trunk/core/src/test/java/org/apache/yay/core/VoidLearningStrategyTest.java?rev=1602661&r1=1602660&r2=1602661&view=diff
==============================================================================
---
labs/yay/trunk/core/src/test/java/org/apache/yay/core/VoidLearningStrategyTest.java
(original)
+++
labs/yay/trunk/core/src/test/java/org/apache/yay/core/VoidLearningStrategyTest.java
Sun Jun 15 06:05:34 2014
@@ -18,17 +18,15 @@
*/
package org.apache.yay.core;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.yay.TrainingExample;
import org.apache.yay.TrainingSet;
-import org.apache.yay.core.VoidLearningStrategy;
import org.junit.Test;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedList;
-
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@labs.apache.org
For additional commands, e-mail: commits-h...@labs.apache.org
