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 2012/05/06 23:16:04 UTC
svn commit: r1334776 - in /labs/yay/trunk/core: pom.xml
src/main/java/org/apache/yay/FeedForwardStrategy.java
src/main/java/org/apache/yay/WeightLearningException.java
Author: tommaso
Date: Sun May 6 21:16:04 2012
New Revision: 1334776
URL: http://svn.apache.org/viewvc?rev=1334776&view=rev
Log:
fixed FeedForwardStrategey predict method, added commons-lang3 dependency for convenience class ArrayUtils
Modified:
labs/yay/trunk/core/pom.xml
labs/yay/trunk/core/src/main/java/org/apache/yay/FeedForwardStrategy.java
labs/yay/trunk/core/src/main/java/org/apache/yay/WeightLearningException.java
Modified: labs/yay/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/pom.xml?rev=1334776&r1=1334775&r2=1334776&view=diff
==============================================================================
--- labs/yay/trunk/core/pom.xml (original)
+++ labs/yay/trunk/core/pom.xml Sun May 6 21:16:04 2012
@@ -24,6 +24,11 @@
<version>2.2</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/FeedForwardStrategy.java
URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/FeedForwardStrategy.java?rev=1334776&r1=1334775&r2=1334776&view=diff
==============================================================================
--- labs/yay/trunk/core/src/main/java/org/apache/yay/FeedForwardStrategy.java (original)
+++ labs/yay/trunk/core/src/main/java/org/apache/yay/FeedForwardStrategy.java Sun May 6 21:16:04 2012
@@ -21,14 +21,13 @@ package org.apache.yay;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Transformer;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.math.linear.ArrayRealVector;
import org.apache.commons.math.linear.RealMatrix;
import org.apache.commons.math.linear.RealVector;
import org.apache.yay.utils.MatrixConverter;
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.Vector;
+import java.util.*;
/**
* Octave code for FF to be converted :
@@ -74,8 +73,8 @@ public class FeedForwardStrategy impleme
x.setRow(i, finRow);
}
}
- // TODO : define a pluggable decision strategy to get the output from the last layer
- return null;
+ double[] lastColumn = x.getColumn(x.getColumnDimension() - 1);
+ return Collections.max(Arrays.asList(ArrayUtils.toObject(lastColumn)));
}
private class RowTransformer implements Transformer {
Modified: labs/yay/trunk/core/src/main/java/org/apache/yay/WeightLearningException.java
URL: http://svn.apache.org/viewvc/labs/yay/trunk/core/src/main/java/org/apache/yay/WeightLearningException.java?rev=1334776&r1=1334775&r2=1334776&view=diff
==============================================================================
--- labs/yay/trunk/core/src/main/java/org/apache/yay/WeightLearningException.java (original)
+++ labs/yay/trunk/core/src/main/java/org/apache/yay/WeightLearningException.java Sun May 6 21:16:04 2012
@@ -25,4 +25,8 @@ public class WeightLearningException ext
public WeightLearningException(Throwable throwable) {
super(throwable);
}
+
+ public WeightLearningException(String s, PredictionException e) {
+ super(s, e);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org