Author: gsingers
Date: Sat Nov 12 23:35:42 2011
New Revision: 1201352
URL: http://svn.apache.org/viewvc?rev=1201352&view=rev
Log:
since these examples are useful for general CSV files, spit out the line number
if there is an error in parsing the line so it can be tracked down
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/RunAdaptiveLogistic.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/RunLogistic.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/RunAdaptiveLogistic.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/RunAdaptiveLogistic.java?rev=1201352&r1=1201351&r2=1201352&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/RunAdaptiveLogistic.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/RunAdaptiveLogistic.java
Sat Nov 12 23:35:42 2011
@@ -50,11 +50,11 @@ public final class RunAdaptiveLogistic {
private RunAdaptiveLogistic() {
}
- public static void main(String[] args) throws IOException {
+ public static void main(String[] args) throws Exception {
mainToOutput(args, new PrintWriter(System.out, true));
}
- static void mainToOutput(String[] args, PrintWriter output) throws
IOException {
+ static void mainToOutput(String[] args, PrintWriter output) throws Exception
{
if (!parseArgs(args)) {
return;
}
@@ -85,9 +85,15 @@ public final class RunAdaptiveLogistic {
line = in.readLine();
Map<String, Double> results = new HashMap<String, Double>();
int k = 0;
+ int lineCount = 2;
while (line != null) {
Vector v = new SequentialAccessSparseVector(lmp.getNumFeatures());
- csv.processLine(line, v, false);
+ try {
+ csv.processLine(line, v, false);
+ } catch (Exception e) {
+ System.out.println("Exception at line " + lineCount);
+ throw e;
+ }
Vector scores = learner.classifyFull(v);
results.clear();
if (maxScoreOnly) {
@@ -108,6 +114,7 @@ public final class RunAdaptiveLogistic {
output.printf(Locale.ENGLISH, "%d records processed \n", k);
}
line = in.readLine();
+ lineCount++;
}
out.flush();
out.close();
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/RunLogistic.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/RunLogistic.java?rev=1201352&r1=1201351&r2=1201352&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/RunLogistic.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/RunLogistic.java
Sat Nov 12 23:35:42 2011
@@ -47,11 +47,11 @@ public final class RunLogistic {
private RunLogistic() {
}
- public static void main(String[] args) throws IOException {
+ public static void main(String[] args) throws Exception {
mainToOutput(args, new PrintWriter(System.out, true));
}
- static void mainToOutput(String[] args, PrintWriter output) throws
IOException {
+ static void mainToOutput(String[] args, PrintWriter output) throws Exception
{
if (parseArgs(args)) {
if (!showAuc && !showConfusion && !showScores) {
showAuc = true;
@@ -70,15 +70,23 @@ public final class RunLogistic {
if (showScores) {
output.printf(Locale.ENGLISH, "\"%s\",\"%s\",\"%s\"\n", "target",
"model-output", "log-likelihood");
}
+ int lineCount = 0;
while (line != null) {
Vector v = new SequentialAccessSparseVector(lmp.getNumFeatures());
- int target = csv.processLine(line, v);
+ int target = 0;
+ try {
+ target = csv.processLine(line, v);
+ } catch (Exception e) {
+ System.out.println("Exception at line " + lineCount);
+ throw e;
+ }
double score = lr.classifyScalar(v);
if (showScores) {
output.printf(Locale.ENGLISH, "%d,%.3f,%.6f\n", target, score,
lr.logLikelihood(target, v));
}
collector.add(target, score);
line = in.readLine();
+ lineCount++;
}
if (showAuc) {
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java?rev=1201352&r1=1201351&r2=1201352&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java
Sat Nov 12 23:35:42 2011
@@ -110,6 +110,7 @@ public final class TrainLogistic {
lr.train(targetValue, input);
line = in.readLine();
+ lineCount++;
}
} finally {
Closeables.closeQuietly(in);
