Return-Path: X-Original-To: apmail-labs-commits-archive@minotaur.apache.org Delivered-To: apmail-labs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DA0AEE50C for ; Tue, 20 Nov 2012 07:33:14 +0000 (UTC) Received: (qmail 77526 invoked by uid 500); 20 Nov 2012 07:33:14 -0000 Delivered-To: apmail-labs-commits-archive@labs.apache.org Received: (qmail 76769 invoked by uid 500); 20 Nov 2012 07:33:05 -0000 Mailing-List: contact commits-help@labs.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: labs@labs.apache.org Delivered-To: mailing list commits@labs.apache.org Received: (qmail 76683 invoked by uid 99); 20 Nov 2012 07:33:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2012 07:33:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2012 07:33:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3AFD8238896F for ; Tue, 20 Nov 2012 07:32:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1411569 - in /labs/yay/trunk/core/src: main/java/org/apache/yay/ main/java/org/apache/yay/neuron/ main/java/org/apache/yay/utils/ test/java/org/apache/yay/ Date: Tue, 20 Nov 2012 07:32:38 -0000 To: commits@labs.apache.org From: tommaso@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121120073239.3AFD8238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tommaso Date: Tue Nov 20 07:32:37 2012 New Revision: 1411569 URL: http://svn.apache.org/viewvc?rev=1411569&view=rev Log: minor fixes: final modifiers, removed unnecessary (un)boxing, etc. Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/BackPropagationLearningStrategy.java 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/StepActivationFunction.java labs/yay/trunk/core/src/main/java/org/apache/yay/neuron/LinearNeuron.java labs/yay/trunk/core/src/main/java/org/apache/yay/utils/ConversionUtils.java labs/yay/trunk/core/src/test/java/org/apache/yay/BasicPerceptronTest.java Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/BackPropagationLearningStrategy.java URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/BackPropagationLearningStrategy.java?rev=1411569&r1=1411568&r2=1411569&view=diff ============================================================================== --- labs/yay/trunk/core/src/main/java/org/apache/yay/BackPropagationLearningStrategy.java (original) +++ labs/yay/trunk/core/src/main/java/org/apache/yay/BackPropagationLearningStrategy.java Tue Nov 20 07:32:37 2012 @@ -32,7 +32,7 @@ import org.apache.yay.utils.ConversionUt */ public class BackPropagationLearningStrategy implements LearningStrategy { - private PredictionStrategy predictionStrategy; + private final PredictionStrategy predictionStrategy; public BackPropagationLearningStrategy(PredictionStrategy predictionStrategy) { this.predictionStrategy = predictionStrategy; 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=1411569&r1=1411568&r2=1411569&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 Nov 20 07:32:37 2012 @@ -28,9 +28,9 @@ import org.apache.yay.utils.ConversionUt */ public class BasicPerceptron implements NeuralNetwork { - private BinaryThresholdNeuron perceptronNeuron; + private final BinaryThresholdNeuron perceptronNeuron; - private double[] currentWeights; + private final double[] currentWeights; /** * Create a perceptron given its input weights. 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=1411569&r1=1411568&r2=1411569&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 Nov 20 07:32:37 2012 @@ -41,8 +41,8 @@ public class NeuralNetworkFactory { */ public static NeuralNetwork create(final Collection> trainingExamples, final WeightsMatrix[] weightsMatrixSet, final LearningStrategy learningStrategy, - final PredictionStrategy predictionStrategy) throws CreationException { - NeuralNetwork neuralNetwork = new NeuralNetwork() { + final PredictionStrategy predictionStrategy) { + return new NeuralNetwork() { private WeightsMatrix[] updatedWeightsMatrixSet = weightsMatrixSet; @@ -65,8 +65,6 @@ public class NeuralNetworkFactory { } } }; - - return neuralNetwork; } } Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/StepActivationFunction.java URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/StepActivationFunction.java?rev=1411569&r1=1411568&r2=1411569&view=diff ============================================================================== --- labs/yay/trunk/core/src/main/java/org/apache/yay/StepActivationFunction.java (original) +++ labs/yay/trunk/core/src/main/java/org/apache/yay/StepActivationFunction.java Tue Nov 20 07:32:37 2012 @@ -23,7 +23,7 @@ package org.apache.yay; */ public class StepActivationFunction implements ActivationFunction { - private double center; + private final double center; public StepActivationFunction(double center) { this.center = center; 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=1411569&r1=1411568&r2=1411569&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 Nov 20 07:32:37 2012 @@ -27,7 +27,7 @@ import org.apache.yay.IdentityActivation public class LinearNeuron extends BasicElaborationUnit { private final double[] weights; - private Double bias; + private final Double bias; public LinearNeuron(Double bias, double... weights) { this.activationFunction = new IdentityActivationFunction(); Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/utils/ConversionUtils.java URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/utils/ConversionUtils.java?rev=1411569&r1=1411568&r2=1411569&view=diff ============================================================================== --- labs/yay/trunk/core/src/main/java/org/apache/yay/utils/ConversionUtils.java (original) +++ labs/yay/trunk/core/src/main/java/org/apache/yay/utils/ConversionUtils.java Tue Nov 20 07:32:37 2012 @@ -60,7 +60,7 @@ public class ConversionUtils { double[] ar = new double[sample.getFeatureVector().size()]; int i = 0; for (Feature f : sample.getFeatureVector()) { - ar[i] = f.getValue().doubleValue(); + ar[i] = f.getValue(); i++; } return ar; @@ -97,7 +97,7 @@ public class ConversionUtils { public static Double[] toDoubleArray(double[] ar) { Double[] doubles = new Double[ar.length]; for (int i = 0; i < ar.length; i++) { - doubles[i] = Double.valueOf(ar[i]); + doubles[i] = ar[i]; } return doubles; } 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=1411569&r1=1411568&r2=1411569&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 Nov 20 07:32:37 2012 @@ -45,7 +45,7 @@ public class BasicPerceptronTest { createTrainingExample(1d, 5d, 6d, 0.5d), createTrainingExample(0.1d, 9d, 4d, 1.9d), createTrainingExample(0.11d, 4d, 2.6d, 9.5d)); - Double output = basicPerceptron.predict(createTrainingExample(0d, 1d, 6d, 0.4d)); + Double output = basicPerceptron.predict(createTrainingExample(null, 1d, 6d, 0.4d)); assertEquals(Double.valueOf(1d), output); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org For additional commands, e-mail: commits-help@labs.apache.org