[pkg-java] r13964 - in tags/weka: . 3.6.5-1/debian 3.6.5-1/debian/patches
Tony Mancill
tmancill at alioth.debian.org
Sat Aug 6 05:51:11 UTC 2011
Author: tmancill
Date: 2011-08-06 05:51:11 +0000 (Sat, 06 Aug 2011)
New Revision: 13964
Added:
tags/weka/3.6.5-1/
tags/weka/3.6.5-1/debian/README.source
tags/weka/3.6.5-1/debian/changelog
tags/weka/3.6.5-1/debian/control
tags/weka/3.6.5-1/debian/patches/jar.patch
tags/weka/3.6.5-1/debian/patches/series
tags/weka/3.6.5-1/debian/rules
Removed:
tags/weka/3.6.5-1/debian/changelog
tags/weka/3.6.5-1/debian/control
tags/weka/3.6.5-1/debian/patches/jar.patch
tags/weka/3.6.5-1/debian/patches/java_cup.patch
tags/weka/3.6.5-1/debian/patches/series
tags/weka/3.6.5-1/debian/rules
Log:
[svn-buildpackage] Tagging weka 3.6.5-1
Copied: tags/weka/3.6.5-1/debian/README.source (from rev 13962, trunk/weka/debian/README.source)
===================================================================
--- tags/weka/3.6.5-1/debian/README.source (rev 0)
+++ tags/weka/3.6.5-1/debian/README.source 2011-08-06 05:51:11 UTC (rev 13964)
@@ -0,0 +1,49 @@
+The .orig.tar.gz file for the Debian 3.6.5 package is generated by the
+orig-tar.sh with this exception. Because the icons are not included in the
+the weka-src.jar file retrieved from the upstream SVN, they are taken
+from the upstream SVN repository (at the URL [[1]) and then added to the
+tarball. The list of resources added is below [2].
+
+ -- tony mancill <tmancill at debian.org> Fri, 05 Aug 2011 22:23:40 -0700
+
+[1] https://svn.scms.waikato.ac.nz/svn/weka/tags/stable-3-6-5/weka
+
+[2] File resources added to the tarball generated by orig-tar.sh:
+
+./src/main/java/weka/gui/weka_icon.png
+./src/main/java/weka/gui/weka_icon_new_48.png
+./src/main/java/weka/gui/weka_icon_new.png
+./src/main/java/weka/classifiers/bayes/net/icons/undo.png
+./src/main/java/weka/classifiers/bayes/net/icons/rrect.png
+./src/main/java/weka/classifiers/bayes/net/icons/paste.png
+./src/main/java/weka/classifiers/bayes/net/icons/cut.png
+./src/main/java/weka/classifiers/bayes/net/icons/alignbottom.png
+./src/main/java/weka/classifiers/bayes/net/icons/oval.png
+./src/main/java/weka/classifiers/bayes/net/icons/alignright.png
+./src/main/java/weka/classifiers/bayes/net/icons/save.png
+./src/main/java/weka/classifiers/bayes/net/icons/spacevertical.png
+./src/main/java/weka/classifiers/bayes/net/icons/arrow.png
+./src/main/java/weka/classifiers/bayes/net/icons/help.png
+./src/main/java/weka/classifiers/bayes/net/icons/aligntop.png
+./src/main/java/weka/classifiers/bayes/net/icons/copy.png
+./src/main/java/weka/classifiers/bayes/net/icons/layout.png
+./src/main/java/weka/classifiers/bayes/net/icons/centerhorizontal.png
+./src/main/java/weka/classifiers/bayes/net/icons/alignleft.png
+./src/main/java/weka/classifiers/bayes/net/icons/lines-s.png
+./src/main/java/weka/classifiers/bayes/net/icons/zoomout.png
+./src/main/java/weka/classifiers/bayes/net/icons/spacehorizontal.png
+./src/main/java/weka/classifiers/bayes/net/icons/lines.png
+./src/main/java/weka/classifiers/bayes/net/icons/new.png
+./src/main/java/weka/classifiers/bayes/net/icons/print.png
+./src/main/java/weka/classifiers/bayes/net/icons/arrow-s.png
+./src/main/java/weka/classifiers/bayes/net/icons/open.png
+./src/main/java/weka/classifiers/bayes/net/icons/zoomin.png
+./src/main/java/weka/classifiers/bayes/net/icons/line-s.png
+./src/main/java/weka/classifiers/bayes/net/icons/oval-s.png
+./src/main/java/weka/classifiers/bayes/net/icons/select.png
+./src/main/java/weka/classifiers/bayes/net/icons/redo.png
+./src/main/java/weka/classifiers/bayes/net/icons/select-s.png
+./src/main/java/weka/classifiers/bayes/net/icons/centervertical.png
+./src/main/java/weka/classifiers/bayes/net/icons/rect-s.png
+./src/main/java/weka/classifiers/bayes/net/icons/rect.png
+./src/main/java/weka/classifiers/bayes/net/icons/line.png
Deleted: tags/weka/3.6.5-1/debian/changelog
===================================================================
--- trunk/weka/debian/changelog 2011-08-04 01:11:07 UTC (rev 13922)
+++ tags/weka/3.6.5-1/debian/changelog 2011-08-06 05:51:11 UTC (rev 13964)
@@ -1,86 +0,0 @@
-weka (3.6.0-3) unstable; urgency=low
-
- * Bump Standards-Version to 3.8.4 (no changes required).
- * Switch to dpkg-source 3.0 (quilt) format.
- * Track only stable releases in watch file.
-
- -- Soeren Sonnenburg <sonne at debian.org> Fri, 23 Apr 2010 22:33:11 +0200
-
-weka (3.6.0-2) unstable; urgency=low
-
- * Change Maintainer: Debian Java Maintainers.
- * Update Standards-Version: 3.8.2 (no changes).
-
- -- Torsten Werner <twerner at debian.org> Mon, 29 Jun 2009 22:02:28 +0200
-
-weka (3.6.0-1) unstable; urgency=low
-
- * New (stable) upstream version.
- * Update copyright and patches to reflect upstream changes.
- * Build single .pdf document.
- * Add ${misc:Depends} to weka-doc dependencies to fix lintian warning.
-
- -- Soeren Sonnenburg <sonne at debian.org> Thu, 25 Dec 2008 11:53:48 +0100
-
-weka (3.5.8+cup1-2) unstable; urgency=low
-
- * Add versioned cup to dependencies (Closes: #504897).
- * Explicitly require openjdk-6-jdk in build dependencies.
- * Require 256m to allow successful building of javadocs.
-
- -- Soeren Sonnenburg <sonne at debian.org> Mon, 24 Nov 2008 10:06:45 +0100
-
-weka (3.5.8+cup1-1) unstable; urgency=low
-
- [ Torsten Werner ]
- * Update Section field in doc-base file.
- * Add Class-Path attribute to jar file.
-
- [ Soeren Sonnenburg ]
- * Update my email address to sonne at debian.org.
- * Update copyright.
- * Remove build, java cup and jflex from orig.tar.gz.
- * Add cup and jflex as build dependency.
- * Patch weka source to use cup from debian.
- * Patch weka shell wrapper to use java-6-sun or openjdk.
- * Obtain documentation from svn.
- * Build depend on texlive-latex-extra (required to generate documentation).
- * Add javadoc as build target.
- * Use java-wrappers to start weka.
-
- -- Soeren Sonnenburg <sonne at debian.org> Thu, 30 Oct 2008 06:42:46 +0100
-
-weka (3.5.8-1) unstable; urgency=low
-
- [ Soeren Sonnenburg ]
- * Bump Standards Version to 3.8.0.
- * Remove references to non-free Java in debian/copyright.
-
- [ Torsten Werner ]
- * new upstream release
- * Switch to openjdk-6.
- * Move package to main.
-
- -- Torsten Werner <twerner at debian.org> Sun, 10 Aug 2008 21:27:05 +0200
-
-weka (3.5.7+tut1-1) unstable; urgency=low
-
- * Updated weka script to support calling other main classes,
- add jvm memory option and allow specific gui.
- * Update manpage for weka script, documenting the new options.
- * Fetch tutorial sources from public svn, generate them dynamically on build
- and include generated .pdfs in doc-base.
-
- -- Soeren Sonnenburg <debian at nn7.de> Sun, 24 Feb 2008 09:18:45 +0100
-
-weka (3.5.7-2) unstable; urgency=low
-
- * Change Architecture: all for the weka package.
-
- -- Torsten Werner <twerner at debian.org> Wed, 19 Dec 2007 23:45:17 +0100
-
-weka (3.5.7-1) unstable; urgency=low
-
- * Initial Release (Closes: #435930)
-
- -- Soeren Sonnenburg <debian at nn7.de> Wed, 19 Dec 2007 19:50:51 +0100
Copied: tags/weka/3.6.5-1/debian/changelog (from rev 13963, trunk/weka/debian/changelog)
===================================================================
--- tags/weka/3.6.5-1/debian/changelog (rev 0)
+++ tags/weka/3.6.5-1/debian/changelog 2011-08-06 05:51:11 UTC (rev 13964)
@@ -0,0 +1,97 @@
+weka (3.6.5-1) unstable; 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)
+ * Add README.source to document process of obtaining .png resources.
+ * Add myself to Uploaders.
+
+ -- tony mancill <tmancill at debian.org> Fri, 05 Aug 2011 22:40:50 -0700
+
+weka (3.6.0-3) unstable; urgency=low
+
+ * Bump Standards-Version to 3.8.4 (no changes required).
+ * Switch to dpkg-source 3.0 (quilt) format.
+ * Track only stable releases in watch file.
+
+ -- Soeren Sonnenburg <sonne at debian.org> Fri, 23 Apr 2010 22:33:11 +0200
+
+weka (3.6.0-2) unstable; urgency=low
+
+ * Change Maintainer: Debian Java Maintainers.
+ * Update Standards-Version: 3.8.2 (no changes).
+
+ -- Torsten Werner <twerner at debian.org> Mon, 29 Jun 2009 22:02:28 +0200
+
+weka (3.6.0-1) unstable; urgency=low
+
+ * New (stable) upstream version.
+ * Update copyright and patches to reflect upstream changes.
+ * Build single .pdf document.
+ * Add ${misc:Depends} to weka-doc dependencies to fix lintian warning.
+
+ -- Soeren Sonnenburg <sonne at debian.org> Thu, 25 Dec 2008 11:53:48 +0100
+
+weka (3.5.8+cup1-2) unstable; urgency=low
+
+ * Add versioned cup to dependencies (Closes: #504897).
+ * Explicitly require openjdk-6-jdk in build dependencies.
+ * Require 256m to allow successful building of javadocs.
+
+ -- Soeren Sonnenburg <sonne at debian.org> Mon, 24 Nov 2008 10:06:45 +0100
+
+weka (3.5.8+cup1-1) unstable; urgency=low
+
+ [ Torsten Werner ]
+ * Update Section field in doc-base file.
+ * Add Class-Path attribute to jar file.
+
+ [ Soeren Sonnenburg ]
+ * Update my email address to sonne at debian.org.
+ * Update copyright.
+ * Remove build, java cup and jflex from orig.tar.gz.
+ * Add cup and jflex as build dependency.
+ * Patch weka source to use cup from debian.
+ * Patch weka shell wrapper to use java-6-sun or openjdk.
+ * Obtain documentation from svn.
+ * Build depend on texlive-latex-extra (required to generate documentation).
+ * Add javadoc as build target.
+ * Use java-wrappers to start weka.
+
+ -- Soeren Sonnenburg <sonne at debian.org> Thu, 30 Oct 2008 06:42:46 +0100
+
+weka (3.5.8-1) unstable; urgency=low
+
+ [ Soeren Sonnenburg ]
+ * Bump Standards Version to 3.8.0.
+ * Remove references to non-free Java in debian/copyright.
+
+ [ Torsten Werner ]
+ * new upstream release
+ * Switch to openjdk-6.
+ * Move package to main.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 10 Aug 2008 21:27:05 +0200
+
+weka (3.5.7+tut1-1) unstable; urgency=low
+
+ * Updated weka script to support calling other main classes,
+ add jvm memory option and allow specific gui.
+ * Update manpage for weka script, documenting the new options.
+ * Fetch tutorial sources from public svn, generate them dynamically on build
+ and include generated .pdfs in doc-base.
+
+ -- Soeren Sonnenburg <debian at nn7.de> Sun, 24 Feb 2008 09:18:45 +0100
+
+weka (3.5.7-2) unstable; urgency=low
+
+ * Change Architecture: all for the weka package.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 19 Dec 2007 23:45:17 +0100
+
+weka (3.5.7-1) unstable; urgency=low
+
+ * Initial Release (Closes: #435930)
+
+ -- Soeren Sonnenburg <debian at nn7.de> Wed, 19 Dec 2007 19:50:51 +0100
Deleted: tags/weka/3.6.5-1/debian/control
===================================================================
--- trunk/weka/debian/control 2011-08-04 01:11:07 UTC (rev 13922)
+++ tags/weka/3.6.5-1/debian/control 2011-08-06 05:51:11 UTC (rev 13964)
@@ -1,52 +0,0 @@
-Source: weka
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Soeren Sonnenburg <sonne at debian.org>,
- Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), openjdk-6-jdk, ant,
- texlive-latex-base, texlive-latex-extra, ghostscript,
- jflex, cup (>=0.11a+20060608)
-Standards-Version: 3.8.4
-Section: science
-Homepage: http://www.cs.waikato.ac.nz/~ml/weka/
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/weka
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/weka/
-
-Package: weka
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre,
- java-wrappers, cup (>=0.11a+20060608)
-Description: Machine learning algorithms for data mining tasks
- Weka is a collection of machine learning algorithms in Java that can
- either be used from the command-line, or called from your own Java
- code. Weka is also ideally suited for developing new machine learning
- schemes.
- .
- Implemented schemes cover decision tree inducers, rule learners, model
- tree generators, support vector machines, locally weighted regression,
- instance-based learning, bagging, boosting, and stacking. Also included
- are clustering methods, and an association rule learner. Apart from
- actual learning schemes, Weka also contains a large variety of tools
- that can be used for pre-processing datasets.
- .
- This package contains the binaries and examples.
-
-Package: weka-doc
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: weka
-Section: doc
-Description: Machine learning algorithms for data mining tasks
- Weka is a collection of machine learning algorithms in Java that can
- either be used from the command-line, or called from your own Java
- code. Weka is also ideally suited for developing new machine learning
- schemes.
- .
- Implemented schemes cover decision tree inducers, rule learners, model
- tree generators, support vector machines, locally weighted regression,
- instance-based learning, bagging, boosting, and stacking. Also included
- are clustering methods, and an association rule learner. Apart from
- actual learning schemes, Weka also contains a large variety of tools
- that can be used for pre-processing datasets.
- .
- This package contains the documentation.
Copied: tags/weka/3.6.5-1/debian/control (from rev 13963, trunk/weka/debian/control)
===================================================================
--- tags/weka/3.6.5-1/debian/control (rev 0)
+++ tags/weka/3.6.5-1/debian/control 2011-08-06 05:51:11 UTC (rev 13964)
@@ -0,0 +1,53 @@
+Source: weka
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Soeren Sonnenburg <sonne at debian.org>,
+ Torsten Werner <twerner at debian.org>,
+ tony mancill <tmancill at debian.org>
+Build-Depends: cdbs, debhelper (>= 5), openjdk-6-jdk, ant,
+ texlive-latex-base, texlive-latex-extra, ghostscript,
+ jflex, cup (>=0.11a+20060608)
+Standards-Version: 3.9.2
+Section: science
+Homepage: http://www.cs.waikato.ac.nz/~ml/weka/
+Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/weka
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/weka/
+
+Package: weka
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre,
+ java-wrappers, cup (>=0.11a+20060608)
+Description: Machine learning algorithms for data mining tasks
+ Weka is a collection of machine learning algorithms in Java that can
+ either be used from the command-line, or called from your own Java
+ code. Weka is also ideally suited for developing new machine learning
+ schemes.
+ .
+ Implemented schemes cover decision tree inducers, rule learners, model
+ tree generators, support vector machines, locally weighted regression,
+ instance-based learning, bagging, boosting, and stacking. Also included
+ are clustering methods, and an association rule learner. Apart from
+ actual learning schemes, Weka also contains a large variety of tools
+ that can be used for pre-processing datasets.
+ .
+ This package contains the binaries and examples.
+
+Package: weka-doc
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: weka
+Section: doc
+Description: Machine learning algorithms for data mining tasks
+ Weka is a collection of machine learning algorithms in Java that can
+ either be used from the command-line, or called from your own Java
+ code. Weka is also ideally suited for developing new machine learning
+ schemes.
+ .
+ Implemented schemes cover decision tree inducers, rule learners, model
+ tree generators, support vector machines, locally weighted regression,
+ instance-based learning, bagging, boosting, and stacking. Also included
+ are clustering methods, and an association rule learner. Apart from
+ actual learning schemes, Weka also contains a large variety of tools
+ that can be used for pre-processing datasets.
+ .
+ This package contains the documentation.
Deleted: tags/weka/3.6.5-1/debian/patches/jar.patch
===================================================================
--- trunk/weka/debian/patches/jar.patch 2011-08-04 01:11:07 UTC (rev 13922)
+++ tags/weka/3.6.5-1/debian/patches/jar.patch 2011-08-06 05:51:11 UTC (rev 13964)
@@ -1,30 +0,0 @@
-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
-@@ -16,7 +16,7 @@
- <!-- set global properties for this build -->
- <property name="src" value="src/main/java"/>
- <property name="src-test" value="src/test/java"/>
-- <property name="lib" value="lib" />
-+ <property name="lib" value="build" />
- <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 @@
- basedir="${build}/classes">
- <manifest>
- <attribute name="Main-Class" value="weka.gui.GUIChooser"/>
-+ <attribute name="Class-Path" value="/usr/share/java/cup.jar"/>
- </manifest>
- </jar>
- </target>
Copied: tags/weka/3.6.5-1/debian/patches/jar.patch (from rev 13951, trunk/weka/debian/patches/jar.patch)
===================================================================
--- tags/weka/3.6.5-1/debian/patches/jar.patch (rev 0)
+++ tags/weka/3.6.5-1/debian/patches/jar.patch 2011-08-06 05:51:11 UTC (rev 13964)
@@ -0,0 +1,40 @@
+--- a/build.xml
++++ b/build.xml
+@@ -16,7 +16,7 @@
+ <!-- set global properties for this build -->
+ <property name="src" value="src/main/java"/>
+ <property name="src-test" value="src/test/java"/>
+- <property name="lib" value="lib" />
++ <property name="lib" value="build" />
+ <property name="regression_tests_root" value="src/test/resources/wekarefs"/>
+ <property name="build" value="build"/>
+ <property name="dist" value="dist"/>
+@@ -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"/>
++ <attribute name="Class-Path" value="/usr/share/java/cup.jar"/>
+ </manifest>
+ </jar>
+ </target>
Deleted: tags/weka/3.6.5-1/debian/patches/java_cup.patch
===================================================================
--- trunk/weka/debian/patches/java_cup.patch 2011-08-04 01:11:07 UTC (rev 13922)
+++ tags/weka/3.6.5-1/debian/patches/java_cup.patch 2011-08-06 05:51:11 UTC (rev 13964)
@@ -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.*;
-
- /**
Deleted: tags/weka/3.6.5-1/debian/patches/series
===================================================================
--- trunk/weka/debian/patches/series 2011-08-04 01:11:07 UTC (rev 13922)
+++ tags/weka/3.6.5-1/debian/patches/series 2011-08-06 05:51:11 UTC (rev 13964)
@@ -1,2 +0,0 @@
-jar.patch
-java_cup.patch
Copied: tags/weka/3.6.5-1/debian/patches/series (from rev 13951, trunk/weka/debian/patches/series)
===================================================================
--- tags/weka/3.6.5-1/debian/patches/series (rev 0)
+++ tags/weka/3.6.5-1/debian/patches/series 2011-08-06 05:51:11 UTC (rev 13964)
@@ -0,0 +1 @@
+jar.patch
Deleted: tags/weka/3.6.5-1/debian/rules
===================================================================
--- trunk/weka/debian/rules 2011-08-04 01:11:07 UTC (rev 13922)
+++ tags/weka/3.6.5-1/debian/rules 2011-08-06 05:51:11 UTC (rev 13964)
@@ -1,36 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-DEB_COMPRESS_EXCLUDE := .pdf
-JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := exejar docs
-DEB_JARS := cup JFlex
-
-install/weka::
- install -m644 -D dist/weka.jar debian/weka/usr/share/java/weka-$(DEB_UPSTREAM_VERSION).jar
- dh_link -pweka /usr/share/java/weka-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/weka.jar
-
-build/weka-doc:: debian/stamp-build-weka-doc
-debian/stamp-build-weka-doc:
- ( cd wekadocs/manual && \
- latex manual.tex ; latex manual.tex ; latex manual.tex ; \
- dvipdf manual.dvi )
- touch $@
-
-install/weka-doc:: debian/stamp-install-weka-doc
-debian/stamp-install-weka-doc:
- #main overview page
- install -m755 -d debian/weka-doc/usr/share/doc/weka-doc
- install -m644 documentation.css documentation.html weka.gif -t debian/weka-doc/usr/share/doc/weka-doc/
- #javadoc
- cp -r doc debian/weka-doc/usr/share/doc/weka-doc/
- #pdf's
- install -m644 wekadocs/manual/manual.pdf debian/weka-doc/usr/share/doc/weka-doc/WekaManual.pdf
- touch $@
-
-get-orig-source:
- -uscan --rename --upstream-version 0
- @echo successfully retrieved upstream tarball
Copied: tags/weka/3.6.5-1/debian/rules (from rev 13951, trunk/weka/debian/rules)
===================================================================
--- tags/weka/3.6.5-1/debian/rules (rev 0)
+++ tags/weka/3.6.5-1/debian/rules 2011-08-06 05:51:11 UTC (rev 13964)
@@ -0,0 +1,36 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+DEB_COMPRESS_EXCLUDE := .pdf
+JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk
+DEB_ANT_BUILDFILE := build.xml
+DEB_ANT_BUILD_TARGET := exejar docs
+DEB_JARS := cup JFlex
+
+install/weka::
+ install -m644 -D dist/weka.jar debian/weka/usr/share/java/weka-$(DEB_UPSTREAM_VERSION).jar
+ dh_link -pweka /usr/share/java/weka-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/weka.jar
+
+build/weka-doc:: debian/stamp-build-weka-doc
+debian/stamp-build-weka-doc:
+ ( cd wekadocs/manual && \
+ latex manual.tex ; latex manual.tex ; latex manual.tex ; \
+ dvipdf manual.dvi )
+ touch $@
+
+install/weka-doc:: debian/stamp-install-weka-doc
+debian/stamp-install-weka-doc:
+ #main overview page
+ install -m755 -d debian/weka-doc/usr/share/doc/weka-doc
+ install -m644 documentation.css documentation.html weka.gif -t debian/weka-doc/usr/share/doc/weka-doc/
+ #javadoc
+ cp -r doc debian/weka-doc/usr/share/doc/weka-doc/
+ #pdf's
+ install -m644 wekadocs/manual/manual.pdf debian/weka-doc/usr/share/doc/weka-doc/WekaManual.pdf
+ touch $@
+
+get-orig-source:
+ -uscan --rename --upstream-version 5
+ @echo successfully retrieved upstream tarball
More information about the pkg-java-commits
mailing list