optimization bug fixes

[debian/openrocket] / src / net / sf / openrocket / gui / dialogs / optimization / GeneralOptimizationDialog.java

diff --git a/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java b/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java
index de5ad2cacdc893cc04fce4c1c914177fc20ea5e7..0ef35e2e7f242eac632fc9079dee62729805806b 100644 (file)
--- a/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java
+++ b/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java
@@ -559,7 +559,7 @@ public class GeneralOptimizationDialog extends JDialog {
                
 
                label = new JLabel(trans.get("status.evalCount"));
-               tip = trans.get("status.evalCount");
+               tip = trans.get("status.evalCount.ttip");
                label.setToolTipText(tip);
                sub.add(label, "gapright unrel");
                
@@ -832,10 +832,9 @@ public class GeneralOptimizationDialog extends JDialog {
                                Point newPoint = latest.getNewPoint();
                                
                                FunctionEvaluationData pointValue = evaluationHistory.get(newPoint);
-                               if (pointValue != null) {
+                               if (pointValue != null && pointValue.getParameterValue() != null) {
                                        bestValue = pointValue.getParameterValue().getValue();
                                } else {
-                                       log.error("History does not contain point " + newPoint);
                                        bestValue = Double.NaN;
                                }