Revision: 18853
http://sourceforge.net/p/gate/code/18853
Author: markagreenwood
Date: 2015-08-05 05:18:08 +0000 (Wed, 05 Aug 2015)
Log Message:
-----------
undid some changes I didn't mean to commit
Modified Paths:
--------------
gate/trunk/gate.l4j.ini
gate/trunk/plugins/Format_CSV/gcp/sample/batch.xml
gate/trunk/plugins/Tagger_Measurements/.classpath
gate/trunk/plugins/Tagger_Measurements/src/gate/creole/measurements/Measurement.java
gate/trunk/plugins/Tagger_Measurements/src/gate/creole/measurements/MeasurementsParser.java
Modified: gate/trunk/gate.l4j.ini
===================================================================
--- gate/trunk/gate.l4j.ini 2015-08-05 05:10:24 UTC (rev 18852)
+++ gate/trunk/gate.l4j.ini 2015-08-05 05:18:08 UTC (rev 18853)
@@ -1,2 +1,2 @@
--Xmx8G
+-Xmx1G
-Xms200m
Modified: gate/trunk/plugins/Format_CSV/gcp/sample/batch.xml
===================================================================
--- gate/trunk/plugins/Format_CSV/gcp/sample/batch.xml 2015-08-05 05:10:24 UTC
(rev 18852)
+++ gate/trunk/plugins/Format_CSV/gcp/sample/batch.xml 2015-08-05 05:18:08 UTC
(rev 18853)
@@ -6,11 +6,11 @@
<report file="report.xml" />
<input class="gate.cloud.io.csv.CSVStreamingInputHandler"
- srcFile="tweets.csv"
+ srcFile="input.csv"
encoding="UTF-8"
separator=","
quote='"'
- column="11"
+ column="1"
labelledColumns="true" />
<output
@@ -18,4 +18,4 @@
encoding="UTF-8"
fileExtension=".GATE.xml"
class="gate.cloud.io.file.GATEStandOffFileOutputHandler" />
-</batch>
\ No newline at end of file
+</batch>
Modified: gate/trunk/plugins/Tagger_Measurements/.classpath
===================================================================
--- gate/trunk/plugins/Tagger_Measurements/.classpath 2015-08-05 05:10:24 UTC
(rev 18852)
+++ gate/trunk/plugins/Tagger_Measurements/.classpath 2015-08-05 05:18:08 UTC
(rev 18853)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry combineaccessrules="false" exported="true" kind="src"
path="/GATE"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified:
gate/trunk/plugins/Tagger_Measurements/src/gate/creole/measurements/Measurement.java
===================================================================
---
gate/trunk/plugins/Tagger_Measurements/src/gate/creole/measurements/Measurement.java
2015-08-05 05:10:24 UTC (rev 18852)
+++
gate/trunk/plugins/Tagger_Measurements/src/gate/creole/measurements/Measurement.java
2015-08-05 05:18:08 UTC (rev 18853)
@@ -160,8 +160,6 @@
Parser psr = new Parser(lex, parser);
- System.out.println("created parser");
-
// this may thrown an exception because of the space change.
// i.e. it throws an exception when it parses 100 m m as the last m is a
// unit but wasn't expected whilst it parses 10 m blah OK and returns 100 m
@@ -170,8 +168,6 @@
// clever if somewhere in the parser or lexer to handle this
Parser.Symbol result = psr.unitexpr();
- System.out.println("got result");
-
if(result == null)
throw new Parser.Exception("string '" + s + "' is not a unit");
@@ -263,12 +259,9 @@
MeasurementsParser parser) {
try {
Measurement v = parse(unit, index, parser);
- System.out.println("parsed");
v.factor = amount;
v.completereduce();
- System.out.println("done reduce");
DefinedFunction func = parser.functions.get(v.getNormalizedUnit());
- System.out.println("got func");
if(func != null) {
Measurement fv = new Measurement(parser);
fv.factor = amount;
@@ -552,10 +545,7 @@
boolean botchanged = reduceproduct(true);
if(!topchanged && !botchanged) break;
}
-
- System.out.println("out of loop");
cancel();
- System.out.println("about to return");
}
/**
Modified:
gate/trunk/plugins/Tagger_Measurements/src/gate/creole/measurements/MeasurementsParser.java
===================================================================
---
gate/trunk/plugins/Tagger_Measurements/src/gate/creole/measurements/MeasurementsParser.java
2015-08-05 05:10:24 UTC (rev 18852)
+++
gate/trunk/plugins/Tagger_Measurements/src/gate/creole/measurements/MeasurementsParser.java
2015-08-05 05:18:08 UTC (rev 18853)
@@ -481,8 +481,8 @@
}
public static void main(String args[]) throws MalformedURLException,
IOException {
- MeasurementsParser parser = new MeasurementsParser((new
File("resources/units.dat")).toURI().toURL(), (new
File("resources/common_words.txt")).toURI().toURL());
- Measurement m = parser.parse(20, "GB //");
+ MeasurementsParser parser = new MeasurementsParser((new
File("plugins/Tagger_Measurements/resources/units.dat")).toURI().toURL(), (new
File("plugins/Tagger_Measurements/resources/common_words.txt")).toURI().toURL());
+ Measurement m = parser.parse(20, "mg p");
System.out.println(m.getParsedText());
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
