[pkg-java] r13951 - in trunk/weka/debian: . patches

Tony Mancill tmancill at alioth.debian.org
Fri Aug 5 05:44:51 UTC 2011


Author: tmancill
Date: 2011-08-05 05:44:51 +0000 (Fri, 05 Aug 2011)
New Revision: 13951

Removed:
   trunk/weka/debian/patches/java_cup.patch
Modified:
   trunk/weka/debian/changelog
   trunk/weka/debian/patches/jar.patch
   trunk/weka/debian/patches/series
   trunk/weka/debian/rules
Log:
interim check-in; prep for 3.6.5 upload

Modified: trunk/weka/debian/changelog
===================================================================
--- trunk/weka/debian/changelog	2011-08-04 21:53:39 UTC (rev 13950)
+++ trunk/weka/debian/changelog	2011-08-05 05:44:51 UTC (rev 13951)
@@ -1,3 +1,12 @@
+weka (3.6.5-1) UNRELEASED; urgency=low
+
+  * Team upload.
+  * New upstream version (Closes: #632082, #598400)
+  * Bump Standards-Version to 3.9.2 (no changes required).
+  * Freshen jar.patch; remove java_cup.patch (incorporated upstream)
+
+ -- tony mancill <tmancill at debian.org>  Wed, 03 Aug 2011 22:08:19 -0700
+
 weka (3.6.0-3) unstable; urgency=low
 
   * Bump Standards-Version to 3.8.4 (no changes required).

Modified: trunk/weka/debian/patches/jar.patch
===================================================================
--- trunk/weka/debian/patches/jar.patch	2011-08-04 21:53:39 UTC (rev 13950)
+++ trunk/weka/debian/patches/jar.patch	2011-08-05 05:44:51 UTC (rev 13951)
@@ -1,7 +1,5 @@
-Index: weka-3.6.0/build.xml
-===================================================================
---- weka-3.6.0.orig/build.xml	2008-12-18 11:26:26.000000000 +0100
-+++ weka-3.6.0/build.xml	2008-12-25 11:07:26.000000000 +0100
+--- a/build.xml
++++ b/build.xml
 @@ -16,7 +16,7 @@
    <!-- set global properties for this build -->
    <property name="src" value="src/main/java"/>
@@ -11,16 +9,28 @@
    <property name="regression_tests_root" value="src/test/resources/wekarefs"/>
    <property name="build" value="build"/>
    <property name="dist"  value="dist"/>
-@@ -101,7 +101,7 @@
-              packagenames="weka.*"
-              Author="yes" 
-              Public="yes" 
--             maxmemory="128m"/>
-+             maxmemory="256m"/>
-     
-     <!-- insert the links to our homepage and documentation.html -->
-     <replace dir="${doc}" 
-@@ -210,6 +210,7 @@
+@@ -90,11 +90,13 @@
+     </copy>
+     <rmic base="${build}/classes"
+        classname="weka.experiment.RemoteEngine"/>
++    <!-- not necessary for debian build
+     <unzip src="${lib}/java-cup.jar" dest="${build}/classes">
+       <patternset>
+         <include name="java_cup/runtime/**/*"/>
+       </patternset>
+     </unzip>
++    -->
+   </target>
+ 
+   <!-- Make the javadocs -->
+@@ -221,11 +223,14 @@
+   <!-- Put everything in ${build}/classes into the weka.jar file -->
+   <target name="exejar" depends="compile, init_dist"
+    description="Create an executable jar file in ./dist">
++    <!-- not built from source; excluded from Debian version
+     <copy todir="${build}/classes/weka/gui" file="resources/MacArffOpenFilesHandler.class"/>
++     -->
+     <jar jarfile="${dist}/weka.jar" 
        basedir="${build}/classes">
       <manifest>
         <attribute name="Main-Class" value="weka.gui.GUIChooser"/>

Deleted: trunk/weka/debian/patches/java_cup.patch
===================================================================
--- trunk/weka/debian/patches/java_cup.patch	2011-08-04 21:53:39 UTC (rev 13950)
+++ trunk/weka/debian/patches/java_cup.patch	2011-08-05 05:44:51 UTC (rev 13951)
@@ -1,1625 +0,0 @@
-Index: weka-3.6.0/parsers.xml
-===================================================================
---- weka-3.6.0.orig/parsers.xml	2008-12-25 10:45:48.000000000 +0100
-+++ weka-3.6.0/parsers.xml	2008-12-25 10:47:00.000000000 +0100
-@@ -75,7 +75,7 @@
-          <arg value="${src}/${parserpkg}/Scanner.jflex"/>
-       </java>
-       <echo message="Generating parser (${parserpkg})."/>
--      <java classname="weka.core.parser.java_cup.Main">
-+      <java classname="java_cup.Main">
-       	 <classpath refid="project.class.path"/>
-          <arg value="-parser"/>
-          <arg value="Parser"/>
-Index: weka-3.6.0/src/main/java/weka/core/MathematicalExpression.java
-===================================================================
---- weka-3.6.0.orig/src/main/java/weka/core/MathematicalExpression.java	2008-12-25 10:45:49.000000000 +0100
-+++ weka-3.6.0/src/main/java/weka/core/MathematicalExpression.java	2008-12-25 10:47:20.000000000 +0100
-@@ -23,8 +23,8 @@
- 
- import weka.core.mathematicalexpression.Parser;
- import weka.core.mathematicalexpression.Scanner;
--import weka.core.parser.java_cup.runtime.DefaultSymbolFactory;
--import weka.core.parser.java_cup.runtime.SymbolFactory;
-+import java_cup.runtime.DefaultSymbolFactory;
-+import java_cup.runtime.SymbolFactory;
- 
- import java.io.ByteArrayInputStream;
- import java.util.HashMap;
-Index: weka-3.6.0/src/main/java/weka/core/mathematicalexpression/Parser.cup
-===================================================================
---- weka-3.6.0.orig/src/main/java/weka/core/mathematicalexpression/Parser.cup	2008-12-25 10:45:49.000000000 +0100
-+++ weka-3.6.0/src/main/java/weka/core/mathematicalexpression/Parser.cup	2008-12-25 10:47:13.000000000 +0100
-@@ -32,7 +32,7 @@
- 
- package weka.core.mathematicalexpression;
- 
--import weka.core.parser.java_cup.runtime.*;
-+import java_cup.runtime.*;
- 
- import java.io.*;
- import java.util.*;
-Index: weka-3.6.0/src/main/java/weka/core/mathematicalexpression/Parser.java
-===================================================================
---- weka-3.6.0.orig/src/main/java/weka/core/mathematicalexpression/Parser.java	2008-12-25 10:45:49.000000000 +0100
-+++ weka-3.6.0/src/main/java/weka/core/mathematicalexpression/Parser.java	2008-12-25 10:52:03.000000000 +0100
-@@ -38,23 +38,23 @@
- 
- package weka.core.mathematicalexpression;
- 
--import weka.core.parser.java_cup.runtime.*;
-+import java_cup.runtime.*;
- import java.io.*;
- import java.util.*;
- 
- /** CUP v0.11a beta 20060608 generated parser.
-   * @version Thu May 15 13:13:25 NZST 2008
-   */
--public class Parser extends weka.core.parser.java_cup.runtime.lr_parser {
-+public class Parser extends java_cup.runtime.lr_parser {
- 
-   /** Default constructor. */
-   public Parser() {super();}
- 
-   /** Constructor which sets the default scanner. */
--  public Parser(weka.core.parser.java_cup.runtime.Scanner s) {super(s);}
-+  public Parser(java_cup.runtime.Scanner s) {super(s);}
- 
-   /** Constructor which sets the default scanner. */
--  public Parser(weka.core.parser.java_cup.runtime.Scanner s, weka.core.parser.java_cup.runtime.SymbolFactory sf) {super(s,sf);}
-+  public Parser(java_cup.runtime.Scanner s, java_cup.runtime.SymbolFactory sf) {super(s,sf);}
- 
-   /** Production table. */
-   protected static final short _production_table[][] = 
-@@ -391,9 +391,9 @@
-     }
- 
-   /** Invoke a user supplied parse action. */
--  public weka.core.parser.java_cup.runtime.Symbol do_action(
-+  public java_cup.runtime.Symbol do_action(
-     int                        act_num,
--    weka.core.parser.java_cup.runtime.lr_parser parser,
-+    java_cup.runtime.lr_parser parser,
-     java.util.Stack            stack,
-     int                        top)
-     throws java.lang.Exception
-@@ -530,15 +530,15 @@
-   }
- 
-   /** Method with the actual generated action code. */
--  public final weka.core.parser.java_cup.runtime.Symbol CUP$Parser$do_action(
-+  public final java_cup.runtime.Symbol CUP$Parser$do_action(
-     int                        CUP$Parser$act_num,
--    weka.core.parser.java_cup.runtime.lr_parser CUP$Parser$parser,
-+    java_cup.runtime.lr_parser CUP$Parser$parser,
-     java.util.Stack            CUP$Parser$stack,
-     int                        CUP$Parser$top)
-     throws java.lang.Exception
-     {
-       /* Symbol object for return from actions */
--      weka.core.parser.java_cup.runtime.Symbol CUP$Parser$result;
-+      java_cup.runtime.Symbol CUP$Parser$result;
- 
-       /* select the action based on the action number */
-       switch (CUP$Parser$act_num)
-@@ -547,14 +547,14 @@
-           case 37: // boolexpr ::= boolexpr OR boolexpr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Boolean l = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Boolean r = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Boolean l = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Boolean r = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = l || r; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -562,14 +562,14 @@
-           case 36: // boolexpr ::= boolexpr AND boolexpr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Boolean l = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Boolean r = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Boolean l = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Boolean r = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = l && r; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -577,11 +577,11 @@
-           case 35: // boolexpr ::= NOT boolexpr 
-             {
-               Boolean RESULT =null;
--		int bleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int bright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Boolean b = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int bleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int bright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Boolean b = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = !b; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -589,11 +589,11 @@
-           case 34: // boolexpr ::= LPAREN boolexpr RPAREN 
-             {
-               Boolean RESULT =null;
--		int bleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int bright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Boolean b = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int bleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int bright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Boolean b = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = b; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -601,14 +601,14 @@
-           case 33: // boolexpr ::= expr EQ expr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Boolean(l.doubleValue() == r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -616,14 +616,14 @@
-           case 32: // boolexpr ::= expr GE expr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Boolean(l.doubleValue() >= r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -631,14 +631,14 @@
-           case 31: // boolexpr ::= expr GT expr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Boolean(l.doubleValue() > r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -646,14 +646,14 @@
-           case 30: // boolexpr ::= expr LE expr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Boolean(l.doubleValue() <= r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -661,14 +661,14 @@
-           case 29: // boolexpr ::= expr LT expr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Boolean(l.doubleValue() < r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -677,7 +677,7 @@
-             {
-               Boolean RESULT =null;
- 		 RESULT = new Boolean(false); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -686,7 +686,7 @@
-             {
-               Boolean RESULT =null;
- 		 RESULT = new Boolean(true); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -694,11 +694,11 @@
-           case 26: // boolexpr ::= BOOLEAN 
-             {
-               Boolean RESULT =null;
--		int bleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int bright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Boolean b = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int bleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int bright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Boolean b = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = b; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",6, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -706,21 +706,21 @@
-           case 25: // funcexpr ::= IFELSE LPAREN boolexpr COMMA expr COMMA expr RPAREN 
-             {
-               Double RESULT =null;
--		int bleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-5)).left;
--		int bright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-5)).right;
--		Boolean b = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-5)).value;
--		int e_trueleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).left;
--		int e_trueright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).right;
--		Double e_true = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-3)).value;
--		int e_falseleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int e_falseright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e_false = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int bleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-5)).left;
-+		int bright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-5)).right;
-+		Boolean b = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-5)).value;
-+		int e_trueleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).left;
-+		int e_trueright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).right;
-+		Double e_true = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-3)).value;
-+		int e_falseleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int e_falseright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e_false = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 if (b) 
-                      RESULT = e_true; 
-                    else
-                      RESULT = e_false; 
-                 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-7)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-7)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -728,11 +728,11 @@
-           case 24: // funcexpr ::= CEIL LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.ceil(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -740,14 +740,14 @@
-           case 23: // funcexpr ::= POW LPAREN expr COMMA expr RPAREN 
-             {
-               Double RESULT =null;
--		int baseleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).left;
--		int baseright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).right;
--		Double base = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-3)).value;
--		int exponentleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int exponentright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double exponent = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int baseleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).left;
-+		int baseright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).right;
-+		Double base = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-3)).value;
-+		int exponentleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int exponentright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double exponent = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.pow(base, exponent)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-5)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-5)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -755,11 +755,11 @@
-           case 22: // funcexpr ::= FLOOR LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.floor(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -767,11 +767,11 @@
-           case 21: // funcexpr ::= RINT LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.rint(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -779,11 +779,11 @@
-           case 20: // funcexpr ::= TAN LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.tan(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -791,11 +791,11 @@
-           case 19: // funcexpr ::= COS LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.cos(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -803,11 +803,11 @@
-           case 18: // funcexpr ::= SIN LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.sin(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -815,11 +815,11 @@
-           case 17: // funcexpr ::= EXP LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.exp(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -827,11 +827,11 @@
-           case 16: // funcexpr ::= LOG LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.log(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -839,11 +839,11 @@
-           case 15: // funcexpr ::= SQRT LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.sqrt(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -851,11 +851,11 @@
-           case 14: // funcexpr ::= ABS LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.abs(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -863,15 +863,15 @@
-           case 13: // varexpr ::= VARIABLE 
-             {
-               Double RESULT =null;
--		int vleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int vright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		String v = (String)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int vleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int vright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		String v = (String)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 if (parser.getSymbols().containsKey(v)) 
-                      RESULT = (Double) parser.getSymbols().get(v); 
-                    else 
-                      throw new IllegalStateException("Unknown symbol '" + v + "'!"); 
-                 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("varexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("varexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -879,14 +879,14 @@
-           case 12: // opexpr ::= expr DIVISION expr 
-             {
-               Double RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Double(l.doubleValue() / r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -894,14 +894,14 @@
-           case 11: // opexpr ::= expr TIMES expr 
-             {
-               Double RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Double(l.doubleValue() * r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -909,14 +909,14 @@
-           case 10: // opexpr ::= expr MINUS expr 
-             {
-               Double RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Double(l.doubleValue() - r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -924,14 +924,14 @@
-           case 9: // opexpr ::= expr PLUS expr 
-             {
-               Double RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Double(l.doubleValue() + r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -939,11 +939,11 @@
-           case 8: // expr ::= funcexpr 
-             {
-               Double RESULT =null;
--		int fleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int fright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double f = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int fleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int fright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double f = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = f; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -951,11 +951,11 @@
-           case 7: // expr ::= varexpr 
-             {
-               Double RESULT =null;
--		int vleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int vright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double v = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int vleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int vright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double v = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = v; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -963,11 +963,11 @@
-           case 6: // expr ::= opexpr 
-             {
-               Double RESULT =null;
--		int oleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int oright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double o = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int oleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int oright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double o = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = o; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -975,11 +975,11 @@
-           case 5: // expr ::= LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = e; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -987,11 +987,11 @@
-           case 4: // expr ::= NUMBER 
-             {
-               Double RESULT =null;
--		int nleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int nright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double n = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int nleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int nright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double n = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = n; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -999,11 +999,11 @@
-           case 3: // expr_part ::= expr 
-             {
-               Object RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 parser.setResult(e); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr_part",1, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr_part",1, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1012,7 +1012,7 @@
-             {
-               Object RESULT =null;
- 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr_list",0, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr_list",0, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1020,11 +1020,11 @@
-           case 1: // $START ::= expr_list EOF 
-             {
-               Object RESULT =null;
--		int start_valleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int start_valright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Object start_val = (Object)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int start_valleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int start_valright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Object start_val = (Object)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		RESULT = start_val;
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("$START",0, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("$START",0, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           /* ACCEPT */
-           CUP$Parser$parser.done_parsing();
-@@ -1035,7 +1035,7 @@
-             {
-               Object RESULT =null;
- 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr_list",0, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr_list",0, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-Index: weka-3.6.0/src/main/java/weka/core/mathematicalexpression/Scanner.java
-===================================================================
---- weka-3.6.0.orig/src/main/java/weka/core/mathematicalexpression/Scanner.java	2008-12-25 10:45:49.000000000 +0100
-+++ weka-3.6.0/src/main/java/weka/core/mathematicalexpression/Scanner.java	2008-12-25 10:47:11.000000000 +0100
-@@ -23,7 +23,7 @@
- 
- package weka.core.mathematicalexpression;
- 
--import weka.core.parser.java_cup.runtime.SymbolFactory;
-+import java_cup.runtime.SymbolFactory;
- import java.io.*;
- 
- /**
-@@ -33,7 +33,7 @@
-  * @version $Revision: 1.2 $
-  */
- 
--public class Scanner implements weka.core.parser.java_cup.runtime.Scanner {
-+public class Scanner implements java_cup.runtime.Scanner {
- 
-   /** This character denotes the end of file */
-   public static final int YYEOF = -1;
-@@ -470,7 +470,7 @@
-    * @return      the next token
-    * @exception   java.io.IOException  if any I/O-Error occurs
-    */
--  public weka.core.parser.java_cup.runtime.Symbol next_token() throws java.io.IOException {
-+  public java_cup.runtime.Symbol next_token() throws java.io.IOException {
-     int zzInput;
-     int zzAction;
- 
-Index: weka-3.6.0/src/main/java/weka/core/mathematicalexpression/Scanner.jflex
-===================================================================
---- weka-3.6.0.orig/src/main/java/weka/core/mathematicalexpression/Scanner.jflex	2008-12-25 10:45:49.000000000 +0100
-+++ weka-3.6.0/src/main/java/weka/core/mathematicalexpression/Scanner.jflex	2008-12-25 10:47:04.000000000 +0100
-@@ -21,7 +21,7 @@
- 
- package weka.core.mathematicalexpression;
- 
--import weka.core.parser.java_cup.runtime.SymbolFactory;
-+import java_cup.runtime.SymbolFactory;
- import java.io.*;
- 
- /**
-Index: weka-3.6.0/src/main/java/weka/filters/unsupervised/attribute/MathExpression.java
-===================================================================
---- weka-3.6.0.orig/src/main/java/weka/filters/unsupervised/attribute/MathExpression.java	2008-12-25 10:45:49.000000000 +0100
-+++ weka-3.6.0/src/main/java/weka/filters/unsupervised/attribute/MathExpression.java	2008-12-25 10:47:22.000000000 +0100
-@@ -35,8 +35,8 @@
- import weka.core.Capabilities.Capability;
- import weka.core.mathematicalexpression.Parser;
- import weka.core.mathematicalexpression.Scanner;
--import weka.core.parser.java_cup.runtime.DefaultSymbolFactory;
--import weka.core.parser.java_cup.runtime.SymbolFactory;
-+import java_cup.runtime.DefaultSymbolFactory;
-+import java_cup.runtime.SymbolFactory;
- import weka.filters.UnsupervisedFilter;
- 
- import java.io.ByteArrayInputStream;
-Index: weka-3.6.0/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Parser.cup
-===================================================================
---- weka-3.6.0.orig/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Parser.cup	2008-12-25 10:45:49.000000000 +0100
-+++ weka-3.6.0/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Parser.cup	2008-12-25 10:47:29.000000000 +0100
-@@ -33,7 +33,7 @@
- package weka.filters.unsupervised.instance.subsetbyexpression;
- 
- import weka.core.*;
--import weka.core.parser.java_cup.runtime.*;
-+import java_cup.runtime.*;
- 
- import java.io.*;
- import java.util.*;
-Index: weka-3.6.0/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Parser.java
-===================================================================
---- weka-3.6.0.orig/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Parser.java	2008-12-25 10:45:49.000000000 +0100
-+++ weka-3.6.0/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Parser.java	2008-12-25 10:50:29.000000000 +0100
-@@ -39,23 +39,23 @@
- package weka.filters.unsupervised.instance.subsetbyexpression;
- 
- import weka.core.*;
--import weka.core.parser.java_cup.runtime.*;
-+import java_cup.runtime.*;
- import java.io.*;
- import java.util.*;
- 
- /** CUP v0.11a beta 20060608 generated parser.
-   * @version Thu Jun 19 13:14:21 NZST 2008
-   */
--public class Parser extends weka.core.parser.java_cup.runtime.lr_parser {
-+public class Parser extends java_cup.runtime.lr_parser {
- 
-   /** Default constructor. */
-   public Parser() {super();}
- 
-   /** Constructor which sets the default scanner. */
--  public Parser(weka.core.parser.java_cup.runtime.Scanner s) {super(s);}
-+  public Parser(java_cup.runtime.Scanner s) {super(s);}
- 
-   /** Constructor which sets the default scanner. */
--  public Parser(weka.core.parser.java_cup.runtime.Scanner s, weka.core.parser.java_cup.runtime.SymbolFactory sf) {super(s,sf);}
-+  public Parser(java_cup.runtime.Scanner s, java_cup.runtime.SymbolFactory sf) {super(s,sf);}
- 
-   /** Production table. */
-   protected static final short _production_table[][] = 
-@@ -422,9 +422,9 @@
-     }
- 
-   /** Invoke a user supplied parse action. */
--  public weka.core.parser.java_cup.runtime.Symbol do_action(
-+  public java_cup.runtime.Symbol do_action(
-     int                        act_num,
--    weka.core.parser.java_cup.runtime.lr_parser parser,
-+    java_cup.runtime.lr_parser parser,
-     java.util.Stack            stack,
-     int                        top)
-     throws java.lang.Exception
-@@ -630,15 +630,15 @@
-   }
- 
-   /** Method with the actual generated action code. */
--  public final weka.core.parser.java_cup.runtime.Symbol CUP$Parser$do_action(
-+  public final java_cup.runtime.Symbol CUP$Parser$do_action(
-     int                        CUP$Parser$act_num,
--    weka.core.parser.java_cup.runtime.lr_parser CUP$Parser$parser,
-+    java_cup.runtime.lr_parser CUP$Parser$parser,
-     java.util.Stack            CUP$Parser$stack,
-     int                        CUP$Parser$top)
-     throws java.lang.Exception
-     {
-       /* Symbol object for return from actions */
--      weka.core.parser.java_cup.runtime.Symbol CUP$Parser$result;
-+      java_cup.runtime.Symbol CUP$Parser$result;
- 
-       /* select the action based on the action number */
-       switch (CUP$Parser$act_num)
-@@ -647,11 +647,11 @@
-           case 37: // funcexpr ::= CEIL LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.ceil(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -659,14 +659,14 @@
-           case 36: // funcexpr ::= POW LPAREN expr COMMA expr RPAREN 
-             {
-               Double RESULT =null;
--		int baseleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).left;
--		int baseright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).right;
--		Double base = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-3)).value;
--		int exponentleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int exponentright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double exponent = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int baseleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).left;
-+		int baseright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)).right;
-+		Double base = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-3)).value;
-+		int exponentleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int exponentright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double exponent = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.pow(base, exponent)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-5)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-5)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -674,11 +674,11 @@
-           case 35: // funcexpr ::= FLOOR LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.floor(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -686,11 +686,11 @@
-           case 34: // funcexpr ::= RINT LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.rint(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -698,11 +698,11 @@
-           case 33: // funcexpr ::= TAN LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.tan(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -710,11 +710,11 @@
-           case 32: // funcexpr ::= COS LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.cos(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -722,11 +722,11 @@
-           case 31: // funcexpr ::= SIN LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.sin(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -734,11 +734,11 @@
-           case 30: // funcexpr ::= EXP LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.exp(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -746,11 +746,11 @@
-           case 29: // funcexpr ::= LOG LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.log(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -758,11 +758,11 @@
-           case 28: // funcexpr ::= SQRT LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.sqrt(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -770,11 +770,11 @@
-           case 27: // funcexpr ::= ABS LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = new Double(Math.abs(e)); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("funcexpr",4, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -782,14 +782,14 @@
-           case 26: // opexpr ::= expr DIVISION expr 
-             {
-               Double RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Double(l.doubleValue() / r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -797,14 +797,14 @@
-           case 25: // opexpr ::= expr TIMES expr 
-             {
-               Double RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Double(l.doubleValue() * r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -812,14 +812,14 @@
-           case 24: // opexpr ::= expr MINUS expr 
-             {
-               Double RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Double(l.doubleValue() - r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -827,14 +827,14 @@
-           case 23: // opexpr ::= expr PLUS expr 
-             {
-               Double RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Double(l.doubleValue() + r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("opexpr",3, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -842,11 +842,11 @@
-           case 22: // expr ::= funcexpr 
-             {
-               Double RESULT =null;
--		int fleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int fright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double f = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int fleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int fright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double f = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = f; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -854,11 +854,11 @@
-           case 21: // expr ::= opexpr 
-             {
-               Double RESULT =null;
--		int oleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int oright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double o = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int oleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int oright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double o = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = o; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -866,11 +866,11 @@
-           case 20: // expr ::= LPAREN expr RPAREN 
-             {
-               Double RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Double e = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Double e = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = e; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -878,15 +878,15 @@
-           case 19: // expr ::= ATTRIBUTE 
-             {
-               Double RESULT =null;
--		int aleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int aright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		String a = (String)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int aleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int aright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		String a = (String)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 if (parser.getSymbols().containsKey(a)) 
-                      RESULT = (Double) parser.getSymbols().get(a); 
-                    else 
-                      throw new IllegalStateException("Unknown symbol '" + a + "'!"); 
-                 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -894,11 +894,11 @@
-           case 18: // expr ::= NUMBER 
-             {
-               Double RESULT =null;
--		int nleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int nright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double n = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int nleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int nright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double n = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = n; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("expr",2, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -906,15 +906,15 @@
-           case 17: // boolexpr ::= ISMISSING LPAREN ATTRIBUTE RPAREN 
-             {
-               Boolean RESULT =null;
--		int aleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int aright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		String a = (String)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int aleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int aright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		String a = (String)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 if (parser.getSymbols().containsKey(a)) 
-                      RESULT = (parser.getSymbols().get(a) instanceof Double) && Instance.isMissingValue((Double) parser.getSymbols().get(a));
-                    else 
-                      throw new IllegalStateException("Unknown symbol '" + a + "'!"); 
-                 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-3)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -922,18 +922,18 @@
-           case 16: // boolexpr ::= ATTRIBUTE IS STRING 
-             {
-               Boolean RESULT =null;
--		int aleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int aright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		String a = (String)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int sleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int sright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		String s = (String)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int aleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int aright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		String a = (String)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int sleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int sright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		String s = (String)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 if (parser.getSymbols().containsKey(a)) 
-                      RESULT = (parser.getSymbols().get(a) instanceof String) && ((String) parser.getSymbols().get(a)).equals(s);
-                    else 
-                      throw new IllegalStateException("Unknown symbol '" + a + "'!"); 
-                 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -941,14 +941,14 @@
-           case 15: // boolexpr ::= boolexpr OR boolexpr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Boolean l = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Boolean r = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Boolean l = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Boolean r = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = l || r; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -956,14 +956,14 @@
-           case 14: // boolexpr ::= boolexpr AND boolexpr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Boolean l = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Boolean r = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Boolean l = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Boolean r = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = l && r; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -971,11 +971,11 @@
-           case 13: // boolexpr ::= NOT boolexpr 
-             {
-               Boolean RESULT =null;
--		int bleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int bright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Boolean b = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int bleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int bright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Boolean b = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = !b; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -983,11 +983,11 @@
-           case 12: // boolexpr ::= LPAREN boolexpr RPAREN 
-             {
-               Boolean RESULT =null;
--		int bleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int bright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Boolean b = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int bleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int bright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Boolean b = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		 RESULT = b; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -995,14 +995,14 @@
-           case 11: // boolexpr ::= expr EQ expr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Boolean(l.doubleValue() == r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1010,14 +1010,14 @@
-           case 10: // boolexpr ::= expr GE expr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Boolean(l.doubleValue() >= r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1025,14 +1025,14 @@
-           case 9: // boolexpr ::= expr GT expr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Boolean(l.doubleValue() > r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1040,14 +1040,14 @@
-           case 8: // boolexpr ::= expr LE expr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Boolean(l.doubleValue() <= r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1055,14 +1055,14 @@
-           case 7: // boolexpr ::= expr LT expr 
-             {
-               Boolean RESULT =null;
--		int lleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
--		int lright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
--		Double l = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
--		int rleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int rright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Double r = (Double)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int lleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).left;
-+		int lright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)).right;
-+		Double l = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-2)).value;
-+		int rleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int rright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Double r = (Double)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = new Boolean(l.doubleValue() < r.doubleValue()); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-2)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1071,7 +1071,7 @@
-             {
-               Boolean RESULT =null;
- 		 RESULT = new Boolean(false); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1080,7 +1080,7 @@
-             {
-               Boolean RESULT =null;
- 		 RESULT = new Boolean(true); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1088,11 +1088,11 @@
-           case 4: // boolexpr ::= BOOLEAN 
-             {
-               Boolean RESULT =null;
--		int bleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int bright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Boolean b = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int bleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int bright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Boolean b = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 RESULT = b; 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr",5, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1100,11 +1100,11 @@
-           case 3: // boolexpr_part ::= boolexpr 
-             {
-               Object RESULT =null;
--		int eleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
--		int eright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
--		Boolean e = (Boolean)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
-+		int eleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).left;
-+		int eright = ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()).right;
-+		Boolean e = (Boolean)((java_cup.runtime.Symbol) CUP$Parser$stack.peek()).value;
- 		 parser.setResult(e); 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr_part",1, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr_part",1, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1113,7 +1113,7 @@
-             {
-               Object RESULT =null;
- 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr_list",0, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr_list",0, ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-@@ -1121,11 +1121,11 @@
-           case 1: // $START ::= boolexpr_list EOF 
-             {
-               Object RESULT =null;
--		int start_valleft = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
--		int start_valright = ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
--		Object start_val = (Object)((weka.core.parser.java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
-+		int start_valleft = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).left;
-+		int start_valright = ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)).right;
-+		Object start_val = (Object)((java_cup.runtime.Symbol) CUP$Parser$stack.elementAt(CUP$Parser$top-1)).value;
- 		RESULT = start_val;
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("$START",0, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("$START",0, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           /* ACCEPT */
-           CUP$Parser$parser.done_parsing();
-@@ -1136,7 +1136,7 @@
-             {
-               Object RESULT =null;
- 
--              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr_list",0, ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((weka.core.parser.java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-+              CUP$Parser$result = parser.getSymbolFactory().newSymbol("boolexpr_list",0, ((java_cup.runtime.Symbol)CUP$Parser$stack.elementAt(CUP$Parser$top-1)), ((java_cup.runtime.Symbol)CUP$Parser$stack.peek()), RESULT);
-             }
-           return CUP$Parser$result;
- 
-Index: weka-3.6.0/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Scanner.java
-===================================================================
---- weka-3.6.0.orig/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Scanner.java	2008-12-25 10:45:49.000000000 +0100
-+++ weka-3.6.0/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Scanner.java	2008-12-25 10:52:16.000000000 +0100
-@@ -23,7 +23,7 @@
- 
- package weka.filters.unsupervised.instance.subsetbyexpression;
- 
--import weka.core.parser.java_cup.runtime.SymbolFactory;
-+import java_cup.runtime.SymbolFactory;
- import java.io.*;
- 
- /**
-@@ -34,7 +34,7 @@
-  * @version $Revision: 1.3 $
-  */
- 
--public class Scanner implements weka.core.parser.java_cup.runtime.Scanner {
-+public class Scanner implements java_cup.runtime.Scanner {
- 
-   /** This character denotes the end of file */
-   public static final int YYEOF = -1;
-@@ -503,7 +503,7 @@
-    * @return      the next token
-    * @exception   java.io.IOException  if any I/O-Error occurs
-    */
--  public weka.core.parser.java_cup.runtime.Symbol next_token() throws java.io.IOException {
-+  public java_cup.runtime.Symbol next_token() throws java.io.IOException {
-     int zzInput;
-     int zzAction;
- 
-Index: weka-3.6.0/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Scanner.jflex
-===================================================================
---- weka-3.6.0.orig/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Scanner.jflex	2008-12-25 10:45:49.000000000 +0100
-+++ weka-3.6.0/src/main/java/weka/filters/unsupervised/instance/subsetbyexpression/Scanner.jflex	2008-12-25 10:47:25.000000000 +0100
-@@ -21,7 +21,7 @@
- 
- package weka.filters.unsupervised.instance.subsetbyexpression;
- 
--import weka.core.parser.java_cup.runtime.SymbolFactory;
-+import java_cup.runtime.SymbolFactory;
- import java.io.*;
- 
- /**

Modified: trunk/weka/debian/patches/series
===================================================================
--- trunk/weka/debian/patches/series	2011-08-04 21:53:39 UTC (rev 13950)
+++ trunk/weka/debian/patches/series	2011-08-05 05:44:51 UTC (rev 13951)
@@ -1,2 +1 @@
 jar.patch
-java_cup.patch

Modified: trunk/weka/debian/rules
===================================================================
--- trunk/weka/debian/rules	2011-08-04 21:53:39 UTC (rev 13950)
+++ trunk/weka/debian/rules	2011-08-05 05:44:51 UTC (rev 13951)
@@ -32,5 +32,5 @@
 	touch $@
 
 get-orig-source:
-	-uscan --rename --upstream-version 0
+	-uscan --rename --upstream-version 5
 	@echo successfully retrieved upstream tarball




More information about the pkg-java-commits mailing list