From: Michael T H. <mic...@us...> - 2003-08-29 19:06:58
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script In directory sc8-pr-cvs1:/tmp/cvs-serv13412/src/org/openscience/jmol/viewer/script Modified Files: Compiler.java Eval.java Log Message: intermediate step in transition from doubles to floats Index: Compiler.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script/Compiler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Compiler.java 16 Aug 2003 14:50:44 -0000 1.1 +++ Compiler.java 29 Aug 2003 19:06:53 -0000 1.2 @@ -157,12 +157,12 @@ continue; } if (lookingAtPositiveDecimal()) { - double value = + float value = // can't use parseFloat with jvm 1.1 // Float.parseFloat(script.substring(ichToken, ichToken + cchToken)); Float.valueOf(script.substring(ichToken, ichToken + cchToken)) .floatValue(); - ltoken.addElement(new Token(Token.decimal, new Double(value))); + ltoken.addElement(new Token(Token.decimal, new Float(value))); continue; } if (lookingAtPositiveInteger() || @@ -777,12 +777,12 @@ tokenNext(); // WITHIN if (tokenNext().tok != Token.leftparen) // ( return leftParenthesisExpected(); - Double distance; + Float distance; Token tokenDistance = tokenNext(); // distance if (tokenDistance.tok == Token.integer) - distance = new Double((tokenDistance.intValue * 4) / 1000.0); + distance = new Float((tokenDistance.intValue * 4) / 1000f); else if (tokenDistance.tok == Token.decimal) - distance = (Double)tokenDistance.value; + distance = (Float)tokenDistance.value; else return numberExpected(); if (tokenNext().tok != Token.opOr) // , Index: Eval.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script/Eval.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Eval.java 29 Aug 2003 18:29:02 -0000 1.8 +++ Eval.java 29 Aug 2003 19:06:53 -0000 1.9 @@ -862,7 +862,7 @@ } void withinInstruction(Token instruction, BitSet bs, BitSet bsResult) { - double distance = ((Double)instruction.value).doubleValue(); + float distance = ((Float)instruction.value).floatValue(); JmolFrame frame = viewer.getJmolFrame(); AtomShapeIterator iterSelected = frame.getAtomIterator(bs); while (iterSelected.hasNext()) { @@ -930,7 +930,7 @@ style = JmolViewer.SHADED; break; case Token.decimal: - double angstroms = ((Double)statement[1].value).doubleValue(); + float angstroms = ((Float)statement[1].value).floatValue(); if (angstroms >= 2) numberOutOfRange(); mar = (short)(angstroms * 1000); @@ -1271,7 +1271,7 @@ millis = token.intValue * 1000; break; case Token.decimal: - millis = (long)(((Double)token.value).doubleValue() * 1000); + millis = (long)(((Float)token.value).floatValue() * 1000); break; default: numberExpected(); @@ -1472,7 +1472,7 @@ mar *= 4; break; case Token.decimal: - double angstroms = ((Double)statement[1].value).doubleValue(); + float angstroms = ((Float)statement[1].value).floatValue(); if (angstroms >= 2) numberOutOfRange(); mar = (short)(angstroms * 1000); @@ -1511,7 +1511,7 @@ style = JmolViewer.SHADED; break; case Token.decimal: - double angstroms = ((Double)statement[1].value).doubleValue(); + float angstroms = ((Float)statement[1].value).floatValue(); if (angstroms >= 2) numberOutOfRange(); mar = (short)(angstroms * 1000); @@ -1721,20 +1721,20 @@ void setSolvent() throws ScriptException { if (statement.length != 3) badArgumentCount(); - double probeRadius = 0; + float probeRadius = 0; switch (statement[2].tok) { case Token.on: - probeRadius = 1.2; + probeRadius = 1.2f; case Token.off: break; case Token.decimal: - probeRadius = ((Double)statement[2].value).doubleValue(); + probeRadius = ((Float)statement[2].value).floatValue(); break; case Token.integer: int radiusRasMol = statement[1].intValue; if (radiusRasMol >= 500) numberOutOfRange(); - probeRadius = radiusRasMol * 4 / 1000.0; + probeRadius = radiusRasMol * 4 / 1000f; break; default: booleanOrNumberExpected(); |