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

- Workaround for bug with plotting when given INF value.

Browse Source 
- Fixed bug with hashing which was not dependent on symbol and would thus give same hash for the range expressions applied to a different variable
- Fixed bug with hashing in which a < could weirdly show up due to unhandled - sign in original string hash
This commit is contained in:
Richard Graham 2012-09-14 05:34:21 +00:00
parent 0a2ddd9d6e
commit 4172bb3bf6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java
View File

@ -352,7 +352,9 @@ public class CustomExpression implements Cloneable{
} }
public Double evaluateDouble(SimulationStatus status){ public Double evaluateDouble(SimulationStatus status){
return evaluate(status).getDoubleValue(); double result = evaluate(status).getDoubleValue();
if (result == Double.NEGATIVE_INFINITY || result == Double.POSITIVE_INFINITY) result = Double.NaN;
return result;
} }
/* /*
@ -498,9 +500,10 @@ public class CustomExpression implements Cloneable{
* Used for temporary substitution when evaluating index and range expressions. * Used for temporary substitution when evaluating index and range expressions.
*/ */
public String hash(){ public String hash(){
Integer hashint = new Integer(this.getExpressionString().hashCode()); Integer hashint = new Integer(this.getExpressionString().hashCode() + symbol.hashCode());
String hash = "$"; String hash = "$";
for (char c : hashint.toString().toCharArray()){ for (char c : hashint.toString().toCharArray()){
if (c == '-') c = '0';
char newc = (char) (c + 17); char newc = (char) (c + 17);
hash = hash + newc; hash = hash + newc;
} }