halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed unneccessary code + empty package.

Browse Source
This commit is contained in:
Fabian Becker 2012-04-20 09:50:13 +00:00
parent af82e0e5a2
commit df39ab0152
2 changed files with 8 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/eva2/tools/math/interpolation/BasicDataSet.java
View File

@ -14,66 +14,37 @@
package eva2.tools.math.interpolation; package eva2.tools.math.interpolation;
import eva2.tools.sort.XYDoubleArray;
/*==========================================================================*
* IMPORTS
*==========================================================================*/
/** /**
* The minimum wrapper class for an <code>AbstractDataSet</code>. * The minimum wrapper class for an <code>AbstractDataSet</code>.
*/ */
public class BasicDataSet extends AbstractDataSet public class BasicDataSet extends AbstractDataSet {
{
/*-------------------------------------------------------------------------*
* protected member variables
*-------------------------------------------------------------------------*/
protected int dataType = -1; protected int dataType = -1;
protected String xLabel = null; protected String xLabel = null;
protected String yLabel = null; protected String yLabel = null;
/*------------------------------------------------------------------------*
* constructor
*------------------------------------------------------------------------*/
public BasicDataSet() public BasicDataSet()
{ {
this(null, null, null, null); 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( public BasicDataSet(
double[] xDoubleData, double[] xDoubleData,
double[] yDoubleData, double[] yDoubleData,
int dataType) int dataType) {
{
this(xDoubleData, yDoubleData, null, null); this(xDoubleData, yDoubleData, null, null);
} }
public BasicDataSet( public BasicDataSet(
double[] xDoubleData, double[] xDoubleData,
double[] yDoubleData, double[] yDoubleData,
String xLabel, String xLabel,
String yLabel) String yLabel) {
{
this.xDoubleData = xDoubleData; this.xDoubleData = xDoubleData;
this.yDoubleData = yDoubleData; this.yDoubleData = yDoubleData;
this.xLabel = xLabel; this.xLabel = xLabel;
this.yLabel = yLabel; this.yLabel = yLabel;
} }
/*-------------------------------------------------------------------------*
* public methods
*-------------------------------------------------------------------------*/
public int getDataType() public int getDataType()
{ {
return dataType; return dataType;
@ -94,7 +65,3 @@ public class BasicDataSet extends AbstractDataSet
return new String(); return new String();
} }
} }
/****************************************************************************
* END OF FILE
****************************************************************************/

112
src/eva2/tools/sort/XYDoubleArray.java
View File

@ -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 <code>double[]</code> 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<x.length;i++){
newArray.x[i]=x[i];
newArray.y[i]=y[i];
}
return newArray;
}
}
/****************************************************************************
* END OF FILE
****************************************************************************/