hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix commit from revision 953 which reverted a bunch of changes related to Froyo compatibility.

Browse Source
This commit is contained in:
Kevin Ruland 2012-08-09 15:04:36 +00:00
parent 91ac8deb7d
commit cb2a3d0e90
1 changed files with 61 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
core/src/net/sf/openrocket/util/LinearInterpolator.java
View File

@ -1,9 +1,8 @@
package net.sf.openrocket.util; package net.sf.openrocket.util;
import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.SortedMap;
import java.util.TreeMap; import java.util.TreeMap;
public class LinearInterpolator implements Cloneable { public class LinearInterpolator implements Cloneable {
@ -74,32 +73,57 @@ public class LinearInterpolator implements Cloneable {
public double getValue(double x) { public double getValue(double x) {
Map.Entry<Double,Double> e1, e2;
double x1, x2; double x1, x2;
double y1, y2; Double y1, y2;
// Froyo does not support floorEntry, firstEntry or higherEntry. We instead have to
// resort to using other more awkward methods.
e1 = sortMap.floorEntry(x); y1 = sortMap.get(x);
if (e1 == null) { if ( y1 != null ) {
// x smaller than any value in the set // Wow, x was a key in the map. Such luck.
e1 = sortMap.firstEntry(); return y1.doubleValue();
if (e1 == null) { }
// we now know that x is not in the map, so we need to find the lower and higher keys.
// let's just make certain that our map is not empty.
if ( sortMap.isEmpty() ) {
throw new IllegalStateException("No points added yet to the interpolator."); throw new IllegalStateException("No points added yet to the interpolator.");
} }
return e1.getValue();
// firstKey in the map - cannot be null since the map is not empty.
Double firstKey = sortMap.firstKey();
// x is smaller than the first entry in the map.
if ( x < firstKey.doubleValue() ) {
y1 = sortMap.get(firstKey);
return y1.doubleValue();
} }
x1 = e1.getKey(); // floor key is the largest key smaller than x - since we have at least one key,
e2 = sortMap.higherEntry(x1); // and x>=firstKey, we know that floorKey != null.
Double floorKey = sortMap.subMap(firstKey, x).lastKey();
if (e2 == null) { x1 = floorKey.doubleValue();
// x larger than any value in the set y1 = sortMap.get(floorKey);
return e1.getValue();
// Now we need to find the key that is greater or equal to x
SortedMap<Double,Double> tailMap = sortMap.tailMap(x);
// Check if x is bigger than all the entries.
if ( tailMap.isEmpty() ) {
return y1.doubleValue();
}
Double ceilKey = tailMap.firstKey();
// Check if x is bigger than all the entries.
if ( ceilKey == null ) {
return y1.doubleValue();
} }
x2 = e2.getKey(); x2 = ceilKey.doubleValue();
y1 = e1.getValue(); y2 = sortMap.get(ceilKey);
y2 = e2.getValue();
return (x - x1)/(x2-x1) * (y2-y1) + y1; return (x - x1)/(x2-x1) * (y2-y1) + y1;
} }
@ -127,25 +151,4 @@ public class LinearInterpolator implements Cloneable {
} }
} }
public static void main(String[] args) {
LinearInterpolator interpolator = new LinearInterpolator(
new double[] {1, 1.5, 2, 4, 5},
new double[] {0, 1, 0, 2, 2}
);
for (double x=0; x < 6; x+=0.1) {
System.out.printf("%.1f: %.2f\n", x, interpolator.getValue(x));
}
// Should be the same
ArrayList<Double> time = new ArrayList<Double>( Arrays.asList( new Double[] {1.0, 1.5, 2.0, 4.0, 5.0} ));
ArrayList<Double> y = new ArrayList<Double>( Arrays.asList( new Double[] {0.0, 1.0, 0.0, 2.0, 2.0} ));
LinearInterpolator interpolator2 = new LinearInterpolator(time,y);
for (double x=0; x < 6; x+=0.1) {
System.out.printf("%.1f: %.2f\n", x, interpolator2.getValue(x));
}
}
} }