From df39ab01522905bd1dce625d8c93fbad96111204 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Fri, 20 Apr 2012 09:50:13 +0000 Subject: [PATCH] Removed unneccessary code + empty package. --- .../math/interpolation/BasicDataSet.java | 49 ++------ src/eva2/tools/sort/XYDoubleArray.java | 112 ------------------ 2 files changed, 8 insertions(+), 153 deletions(-) delete mode 100644 src/eva2/tools/sort/XYDoubleArray.java diff --git a/src/eva2/tools/math/interpolation/BasicDataSet.java b/src/eva2/tools/math/interpolation/BasicDataSet.java index 44367080..24cc4609 100644 --- a/src/eva2/tools/math/interpolation/BasicDataSet.java +++ b/src/eva2/tools/math/interpolation/BasicDataSet.java @@ -14,66 +14,37 @@ package eva2.tools.math.interpolation; -import eva2.tools.sort.XYDoubleArray; - -/*==========================================================================* - * IMPORTS - *==========================================================================*/ - /** * The minimum wrapper class for an AbstractDataSet. */ -public class BasicDataSet extends AbstractDataSet -{ - /*-------------------------------------------------------------------------* - * protected member variables - *-------------------------------------------------------------------------*/ +public class BasicDataSet extends AbstractDataSet { protected int dataType = -1; protected String xLabel = null; protected String yLabel = null; - /*------------------------------------------------------------------------* - * constructor - *------------------------------------------------------------------------*/ public BasicDataSet() { this(null, null, null, null); } - public BasicDataSet(XYDoubleArray data) - { - this(data.x, data.y, null, null); - } - - public BasicDataSet(XYDoubleArray data, String xLabel, String yLabel) - { - this(data.x, data.y, xLabel, yLabel); - } - public BasicDataSet( - double[] xDoubleData, - double[] yDoubleData, - int dataType) - { + double[] xDoubleData, + double[] yDoubleData, + int dataType) { this(xDoubleData, yDoubleData, null, null); } public BasicDataSet( - double[] xDoubleData, - double[] yDoubleData, - String xLabel, - String yLabel) - { + double[] xDoubleData, + double[] yDoubleData, + String xLabel, + String yLabel) { this.xDoubleData = xDoubleData; this.yDoubleData = yDoubleData; this.xLabel = xLabel; this.yLabel = yLabel; } - /*-------------------------------------------------------------------------* - * public methods - *-------------------------------------------------------------------------*/ - public int getDataType() { return dataType; @@ -94,7 +65,3 @@ public class BasicDataSet extends AbstractDataSet return new String(); } } - -/**************************************************************************** - * END OF FILE - ****************************************************************************/ \ No newline at end of file diff --git a/src/eva2/tools/sort/XYDoubleArray.java b/src/eva2/tools/sort/XYDoubleArray.java deleted file mode 100644 index 9318b154..00000000 --- a/src/eva2/tools/sort/XYDoubleArray.java +++ /dev/null @@ -1,112 +0,0 @@ -/** - * Filename: $RCSfile: XYDoubleArray.java,v $ - * Purpose: A description of the contents of this file. - * Language: Java - * Compiler: JDK 1.4 - * Authors: Joerg K. Wegner - * Version: $Revision: 1.6 $ - * $Date: 2001/10/17 11:37:42 $ - * $Author: wegnerj $ - * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany - */ - -/*==========================================================================* - * PACKAGE - *==========================================================================*/ - -package eva2.tools.sort; - -/*==========================================================================* - * IMPORTS - *==========================================================================*/ - - -/*==========================================================================* - * CLASS DECLARATION - *==========================================================================*/ - -/** - * Defines two double[] arrays. - * - * @version $Revision: 1.6 $, $Date: 2001/10/17 11:37:42 $ - * - */ -public class XYDoubleArray implements Cloneable{ - /*-------------------------------------------------------------------------* - * public member variables - *-------------------------------------------------------------------------*/ - //public static final int TABLE_OUTPUT=JChart2DUtils.TABLE_OUTPUT; - //public static final int VECTOR_OUTPUT=JChart2DUtils.VECTOR_OUTPUT; - public double[] x=null; - public double[] y=null; - - /*-------------------------------------------------------------------------* - * constructor - *-------------------------------------------------------------------------*/ - public XYDoubleArray(int length) - { - this.x=new double[length]; - this.y=new double[length]; - } - - public XYDoubleArray(double[] x, double[] y) - { - this.x=x; - this.y=y; - } - - /*-------------------------------------------------------------------------* - * public methods - *-------------------------------------------------------------------------*/ - - public final void swap(int a, int b) - { - double xx = x[a]; x[a] = x[b]; x[b] = xx; - double yy = y[a]; y[a] = y[b]; y[b] = yy; - } - - /*public final void sortX(){ - QuickInsertSort quickInsertSort = new QuickInsertSort(); - quickInsertSort.sortX(this); - } - - public final void sortY(){ - QuickInsertSort quickInsertSort = new QuickInsertSort(); - quickInsertSort.sortY(this); - }*/ - - // - // uses jchart2d methods !;-( - // - /*public String toString(){ - return toString(TABLE_OUTPUT); - } - - private String toString(int output){ - if(x==null || y==null)return null; - BasicDataSet data=new BasicDataSet(x, y, - AbstractDataSet.CONTINUOUS_DATA, - "x", - "y"); - String s=JChart2DUtils.writeDataSetToString(data, output); - return s; - }*/ - - public Object clone() - { - double[] newX=new double[x.length]; - double[] newY=new double[y.length]; - XYDoubleArray newArray=new XYDoubleArray(newX, newY); - - for(int i=0;i