You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by to...@apache.org on 2013/02/12 22:18:22 UTC
svn commit: r1445386 - in /labs/yay/trunk/core/src:
main/java/org/apache/yay/ main/java/org/apache/yay/neuron/
test/java/org/apache/yay/
Author: tommaso
Date: Tue Feb 12 21:18:22 2013
New Revision: 1445386
URL: http://svn.apache.org/r1445386
Log:
minor fix: using Double instead of double in neurons
Modified:
labs/yay/trunk/core/src/main/java/org/apache/yay/BasicPerceptron.java
labs/yay/trunk/core/src/main/java/org/apache/yay/NeuralNetworkFactory.java
labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/BinaryThresholdNeuron.java
labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/LinearNeuron.java
labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/RectifiedLinearNeuron.java
labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/SigmoidNeuron.java
labs/yay/trunk/core/src/test/java/org/apache/yay/BasicPerceptronTest.java
Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/BasicPerceptron.java
URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/BasicPerceptron.java?rev=1445386&r1=1445385&r2=1445386&view=diff
==============================================================================
--- labs/yay/trunk/core/src/main/java/org/apache/yay/BasicPerceptron.java (original)
+++ labs/yay/trunk/core/src/main/java/org/apache/yay/BasicPerceptron.java Tue Feb 12 21:18:22 2013
@@ -32,17 +32,17 @@ public class BasicPerceptron implements
private final BinaryThresholdNeuron perceptronNeuron;
- private final double[] currentWeights;
+ private final Double[] currentWeights;
/**
* Create a perceptron given its input weights. Assume bias weight is given and all the input
* samples have a corresponding 1 input for that
- *
+ *
* @param inputWeights
* the array of starting weights for the perceptron
*/
- public BasicPerceptron(double... inputWeights) {
- this.perceptronNeuron = new BinaryThresholdNeuron(0, inputWeights);
+ public BasicPerceptron(Double... inputWeights) {
+ this.perceptronNeuron = new BinaryThresholdNeuron(0d, inputWeights);
this.currentWeights = inputWeights;
}
Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/NeuralNetworkFactory.java
URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/NeuralNetworkFactory.java?rev=1445386&r1=1445385&r2=1445386&view=diff
==============================================================================
--- labs/yay/trunk/core/src/main/java/org/apache/yay/NeuralNetworkFactory.java (original)
+++ labs/yay/trunk/core/src/main/java/org/apache/yay/NeuralNetworkFactory.java Tue Feb 12 21:18:22 2013
@@ -41,7 +41,7 @@ public class NeuralNetworkFactory {
*/
public static NeuralNetwork<Double, Double> create(final Collection<TrainingExample<Double, Double>> trainingExamples,
final RealMatrix[] RealMatrixSet, final LearningStrategy<Double, Double> learningStrategy,
- final PredictionStrategy<Double, Double> predictionStrategy) {
+ final PredictionStrategy<Double, Double> predictionStrategy) throws CreationException {
return new NeuralNetwork<Double, Double>() {
private RealMatrix[] updatedRealMatrixSet = RealMatrixSet;
Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/BinaryThresholdNeuron.java
URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/BinaryThresholdNeuron.java?rev=1445386&r1=1445385&r2=1445386&view=diff
==============================================================================
--- labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/BinaryThresholdNeuron.java (original)
+++ labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/BinaryThresholdNeuron.java Tue Feb 12 21:18:22 2013
@@ -30,14 +30,14 @@ import org.apache.yay.StepActivationFunc
*/
public class BinaryThresholdNeuron extends BasicElaborationUnit<Double> {
- private double[] weights;
+ private Double[] weights;
- public BinaryThresholdNeuron(double threshold, double... weights) {
+ public BinaryThresholdNeuron(Double threshold, Double... weights) {
super(new StepActivationFunction(threshold));
this.weights = weights;
}
- public void updateWeights(double... weights) {
+ public void updateWeights(Double... weights) {
this.weights = weights;
}
Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/LinearNeuron.java
URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/LinearNeuron.java?rev=1445386&r1=1445385&r2=1445386&view=diff
==============================================================================
--- labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/LinearNeuron.java (original)
+++ labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/LinearNeuron.java Tue Feb 12 21:18:22 2013
@@ -26,11 +26,11 @@ import org.apache.yay.IdentityActivation
*/
public class LinearNeuron extends BasicElaborationUnit<Double> {
- private final double[] weights;
+ private final Double[] weights;
private final Double bias;
- public LinearNeuron(Double bias, double... weights) {
+ public LinearNeuron(Double bias, Double... weights) {
super(new IdentityActivationFunction<Double>());
this.bias = bias;
this.weights = weights;
Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/RectifiedLinearNeuron.java
URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/RectifiedLinearNeuron.java?rev=1445386&r1=1445385&r2=1445386&view=diff
==============================================================================
--- labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/RectifiedLinearNeuron.java (original)
+++ labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/RectifiedLinearNeuron.java Tue Feb 12 21:18:22 2013
@@ -26,7 +26,7 @@ import org.apache.yay.ActivationFunction
*/
public class RectifiedLinearNeuron extends LinearNeuron {
- public RectifiedLinearNeuron(Double bias, double... weights) {
+ public RectifiedLinearNeuron(Double bias, Double... weights) {
super(bias, weights);
this.activationFunction = new ActivationFunction<Double>() {
@Override
Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/SigmoidNeuron.java
URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/SigmoidNeuron.java?rev=1445386&r1=1445385&r2=1445386&view=diff
==============================================================================
--- labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/SigmoidNeuron.java (original)
+++ labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/SigmoidNeuron.java Tue Feb 12 21:18:22 2013
@@ -25,7 +25,7 @@ import org.apache.yay.SigmoidFunction;
*/
public class SigmoidNeuron extends LinearNeuron {
- public SigmoidNeuron(Double bias, double... weights) {
+ public SigmoidNeuron(Double bias, Double... weights) {
super(bias, weights);
this.activationFunction = new SigmoidFunction();
}
Modified: labs/yay/trunk/core/src/test/java/org/apache/yay/BasicPerceptronTest.java
URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/test/java/org/apache/yay/BasicPerceptronTest.java?rev=1445386&r1=1445385&r2=1445386&view=diff
==============================================================================
--- labs/yay/trunk/core/src/test/java/org/apache/yay/BasicPerceptronTest.java (original)
+++ labs/yay/trunk/core/src/test/java/org/apache/yay/BasicPerceptronTest.java Tue Feb 12 21:18:22 2013
@@ -32,7 +32,7 @@ public class BasicPerceptronTest {
@Test
@SuppressWarnings("unchecked")
public void testLearnPhase() throws Exception {
- BasicPerceptron basicPerceptron = new BasicPerceptron(1, 2, 3, 4);
+ BasicPerceptron basicPerceptron = new BasicPerceptron(1d, 2d, 3d, 4d);
basicPerceptron.learn(createTrainingExample(1d, 4d, 5d, 6d),
createTrainingExample(1d, 5d, 6d, 0.5d), createTrainingExample(0.1d, 9d, 4d, 1.9d),
createTrainingExample(0.11d, 4d, 2.6d, 9.5d));
@@ -41,7 +41,7 @@ public class BasicPerceptronTest {
@Test
@SuppressWarnings("unchecked")
public void testPredictionPhase() throws Exception {
- BasicPerceptron basicPerceptron = new BasicPerceptron(1, 2, 3, 4);
+ BasicPerceptron basicPerceptron = new BasicPerceptron(1d, 2d, 3d, 4d);
basicPerceptron.learn(createTrainingExample(1d, 4d, 5d, 6d),
createTrainingExample(1d, 5d, 6d, 0.5d), createTrainingExample(0.1d, 9d, 4d, 1.9d),
createTrainingExample(0.11d, 4d, 2.6d, 9.5d));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org