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

A bit of refactoring.

Browse Source
This commit is contained in:
Marcel Kronfeld
2010-09-29 13:50:13 +00:00
parent 7d7dcb5ce0
commit e62f134b8f
3 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/eva2/tools/BasicResourceLoader.java
View File

@@ -287,7 +287,7 @@ public class BasicResourceLoader implements ResourceLoader
} else {
for (int i=0; i<cols.length; i++) {
try {
if ((cols[i]>=entries.length) || (entries[cols[i]]==null || (entries[cols[i]].length()==0))) dest[lineCnt][i]=Double.NaN;
if ((cols[i]<0) || ((cols[i]>=entries.length) || (entries[cols[i]]==null || (entries[cols[i]].length()==0)))) dest[lineCnt][i]=Double.NaN;
else dest[lineCnt][i] = Double.valueOf(entries[cols[i]]);
} catch(NumberFormatException ex) {
System.err.println("Invalid Double format in line " + lineCnt + ", data was " + entries[cols[i]]);

42
src/eva2/tools/ToolBox.java
View File

@@ -119,4 +119,46 @@ public class ToolBox {
}
return vals;
}
/**
* Return an array containing only those lines which have values within
* lower and upper bound (included) in the indexed column.
*
* @param dat a 2D double array
* @param i index of the column to look at
* @param lower lower bound of values to filter rows for
* @param upper upper bound of values to filter rows for
* @return a filtered 2D double array where value[*][i] in [lower,upper]
*/
public static double[][] filterBy(double[][] dat, int i, double lower, double upper) {
if (dat==null||dat.length==0) return dat;
if (i >= dat[0].length) {
System.err.println("Error, invalid column index " + i + " for data array with " + dat[0].length + " columns!");
}
ArrayList<double[]> matching = new ArrayList<double[]>(5);
for (double[] row : dat) {
if (row[i]<=upper && row[i]>=lower) matching.add(row);
}
return matching.toArray(new double[matching.size()][dat[0].length]);
}
/**
* Retrieve a given number of columns from a double matrix. The given
* data array must have valid matrix dimensions (equal number of columns per row).
*
* @param data a 2D double array
* @param cols the indices of columns in data to return
* @return a 2D double array containing the indexed columns from data
*/
public static double[][] getCols(double[][] data, int ... cols) {
if (data==null || (data[0]==null)) return null;
int nCols = cols.length;
if (nCols>data[0].length) System.err.println("Error, mismatching column count in Mathematics.getCols!");
double[][] ret = new double[data.length][cols.length];
for (int i=0; i<data.length; i++) {
for (int j=0; j<cols.length; j++) ret[i][j] = data[i][cols[j]];
}
return ret;
}
}

43
src/eva2/tools/math/Mathematics.java
View File

@@ -1367,47 +1367,4 @@ public class Mathematics {
vec[i] *= scale;
}
}
/**
* Return an array containing only those lines which have values within
* lower and upper bound (included) in the indexed column.
*
* @param dat
* @param i
* @param d
* @param e
* @return
*/
public static double[][] filterBy(double[][] dat, int i, double lower, double upper) {
if (dat==null||dat.length==0) return dat;
if (i >= dat[0].length) {
System.err.println("Error, invalid column index " + i + " for data array with " + dat[0].length + " columns!");
}
ArrayList<double[]> matching = new ArrayList<double[]>(5);
for (double[] row : dat) {
if (row[i]<=upper && row[i]>=lower) matching.add(row);
}
return matching.toArray(new double[matching.size()][dat[0].length]);
}
/**
* Retrieve a given number of columns from a double matrix. The given
* data array must have valid matrix dimensions (equal number of columns per row).
*
* @param filtered
* @param i
* @param j
* @return
*/
public static double[][] getCols(double[][] data, int ... cols) {
if (data==null || (data[0]==null)) return null;
int nCols = cols.length;
if (nCols>data[0].length) System.err.println("Error, mismatching column count in Mathematics.getCols!");
double[][] ret = new double[data.length][cols.length];
for (int i=0; i<data.length; i++) {
for (int j=0; j<cols.length; j++) ret[i][j] = data[i][cols[j]];
}
return ret;
}
}