From 6806e6cf0a8d99df385e0592db8e2f41c6bfcb5b Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 16 Feb 2015 00:04:40 -0600 Subject: [PATCH] auto-sync --- .../apache/commons/math3/special/Beta.java | 20 +++++++++---------- .../apache/commons/math3/special/Gamma.java | 2 +- .../apache/commons/math3/util/MathArrays.java | 4 ++-- java_console/ui/src/com/rusefi/Launcher.java | 2 +- .../ui/src/com/rusefi/ui/WarningPanel.java | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/java_console/models/src/org/apache/commons/math3/special/Beta.java b/java_console/models/src/org/apache/commons/math3/special/Beta.java index fc316e90c9..c9f915e770 100644 --- a/java_console/models/src/org/apache/commons/math3/special/Beta.java +++ b/java_console/models/src/org/apache/commons/math3/special/Beta.java @@ -54,24 +54,24 @@ public class Beta { /** Maximum allowed numerical error. */ private static final double DEFAULT_EPSILON = 1E-14; - /** The constant value of ½log 2π. */ + /** The constant value of 1/2 log 2pi. */ private static final double HALF_LOG_TWO_PI = .9189385332046727; /** *

- * The coefficients of the series expansion of the Δ function. This function + * The coefficients of the series expansion of the Delta function. This function * is defined as follows *

- *
Δ(x) = log Γ(x) - (x - 0.5) log a + a - 0.5 log 2π,
+ *
Delta(x) = log Gamma(x) - (x - 0.5) log a + a - 0.5 log 2pi,
*

* see equation (23) in Didonato and Morris (1992). The series expansion, - * which applies for x ≥ 10, reads + * which applies for x >= 10, reads *

* 
      *                 14
      *                ====
      *             1  \                2 n
-     *     Δ(x) = ---  >    d  (10 / x)
+     * delta(x) = ---  >    d  (10 / x)
      *             x  /      n
      *                ====
      *                n = 0
@@ -255,7 +255,7 @@ public class Beta {
 
 
     /**
-     * Returns the value of log Γ(a + b) for 1 ≤ a, b ≤ 2. Based on the
+     * Returns the value of log Gamma(a + b) for 1 <= a, b <= 2. Based on the
      * NSWC Library of Mathematics Subroutines double precision
      * implementation, {@code DGSMLN}. In {@code BetaTest.testLogGammaSum()},
      * this private method is accessed through reflection.
@@ -287,7 +287,7 @@ public class Beta {
     }
 
     /**
-     * Returns the value of log[Γ(b) / Γ(a + b)] for a ≥ 0 and b ≥ 10. Based on
+     * Returns the value of log[Gamma(b) / Gamma(a + b)] for a >= 0 and b >= 10. Based on
      * the NSWC Library of Mathematics Subroutines double precision
      * implementation, {@code DLGDIV}. In
      * {@code BetaTest.testLogGammaMinusLogGammaSum()}, this private method is
@@ -329,7 +329,7 @@ public class Beta {
     }
 
     /**
-     * Returns the value of Δ(b) - Δ(a + b), with 0 ≤ a ≤ b and b ≥ 10. Based
+     * Returns the value of Delta(b) - Delta(a + b), with 0 <= a <= b and b => 10. Based
      * on equations (26), (27) and (28) in Didonato and Morris (1992).
      *
      * @param a First argument.
@@ -374,7 +374,7 @@ public class Beta {
     }
 
     /**
-     * Returns the value of Δ(p) + Δ(q) - Δ(p + q), with p, q ≥ 10. Based on
+     * Returns the value of Delta(p) + Delta(q) - Delta(p + q), with p, q >= 10. Based on
      * the NSWC Library of Mathematics Subroutines double precision
      * implementation, {@code DBCORR}. In
      * {@code BetaTest.testSumDeltaMinusDeltaSum()}, this private method is
@@ -407,7 +407,7 @@ public class Beta {
     }
 
     /**
-     * Returns the value of log B(p, q) for 0 ≤ x ≤ 1 and p, q > 0. Based on the
+     * Returns the value of log Beta(p, q) for 0 <= x <= 1 and p, q > 0. Based on the
      * NSWC Library of Mathematics Subroutines implementation,
      * {@code DBETLN}.
      *
diff --git a/java_console/models/src/org/apache/commons/math3/special/Gamma.java b/java_console/models/src/org/apache/commons/math3/special/Gamma.java
index fef30e684b..e92354098d 100644
--- a/java_console/models/src/org/apache/commons/math3/special/Gamma.java
+++ b/java_console/models/src/org/apache/commons/math3/special/Gamma.java
@@ -636,7 +636,7 @@ public class Gamma {
 
 
     /**
-     * Returns the value of Γ(x). Based on the NSWC Library of
+     * Returns the value of Gamma(x). Based on the NSWC Library of
      * Mathematics Subroutines double precision implementation,
      * {@code DGAMMA}.
      *
diff --git a/java_console/models/src/org/apache/commons/math3/util/MathArrays.java b/java_console/models/src/org/apache/commons/math3/util/MathArrays.java
index a9e11b9d58..4990aa7240 100644
--- a/java_console/models/src/org/apache/commons/math3/util/MathArrays.java
+++ b/java_console/models/src/org/apache/commons/math3/util/MathArrays.java
@@ -1489,8 +1489,8 @@ public class MathArrays {
 
     /**
      * Shuffle the entries of the given array, using the
-     * 
-     * Fisher–Yates algorithm.
+     * 
+     * Fisher-Yates algorithm.
      * The {@code start} and {@code pos} parameters select which portion
      * of the array is randomized and which is left untouched.
      *
diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java
index 304e6a22b4..ab82c88898 100644
--- a/java_console/ui/src/com/rusefi/Launcher.java
+++ b/java_console/ui/src/com/rusefi/Launcher.java
@@ -53,7 +53,7 @@ public class Launcher extends FrameHelper {
         tabbedPane.addTab("LE controls", new FlexibleControls().getPanel());
 
 //        tabbedPane.addTab("ADC", new AdcPanel(new BooleanInputsModel()).createAdcPanel());
-        if (SHOW_STIMULATOR && !LinkManager.isStimulationMode) {
+        if (SHOW_STIMULATOR && !LinkManager.isStimulationMode && !LinkManager.isLogViewerMode(port)) {
             EcuStimulator stimulator = EcuStimulator.getInstance();
             tabbedPane.add("ECU stimulation", stimulator.getPanel());
         }
diff --git a/java_console/ui/src/com/rusefi/ui/WarningPanel.java b/java_console/ui/src/com/rusefi/ui/WarningPanel.java
index 8c052b829b..a94fb5b484 100644
--- a/java_console/ui/src/com/rusefi/ui/WarningPanel.java
+++ b/java_console/ui/src/com/rusefi/ui/WarningPanel.java
@@ -14,7 +14,7 @@ public class WarningPanel {
     private final JPanel panel = new JPanel(new BorderLayout());
 
     private final JLabel label = new JLabel();
-    private final JButton reset = new JButton("reset");
+    private final JButton reset = new JButton("clear warning");
 
     public WarningPanel() {
         label.setForeground(Color.red);