Change AltosLib to altoslib

[fw/altos] / altosui / AltosFlightStats.java

diff --git a/altosui/AltosFlightStats.java b/altosui/AltosFlightStats.java
index d37f90b8604ad91814604d0d87a3c4eda45f490f..967f094f3516322f3660416d0d09b9f636324ca5 100644 (file)
--- a/altosui/AltosFlightStats.java
+++ b/altosui/AltosFlightStats.java
@@ -15,25 +15,16 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package AltosUI;
+package altosui;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib.*;
 
 public class AltosFlightStats {
        double          max_height;
        double          max_speed;
        double          max_acceleration;
-       double[]        state_speed = new double[Altos.ao_flight_invalid + 1];
+       double[]        state_accel_speed = new double[Altos.ao_flight_invalid + 1];
        double[]        state_baro_speed = new double[Altos.ao_flight_invalid + 1];
        double[]        state_accel = new double[Altos.ao_flight_invalid + 1];
        int[]           state_count = new int[Altos.ao_flight_invalid + 1];
@@ -132,7 +123,7 @@ public class AltosFlightStats {
                                        }
                                }
                                state_accel[state.state] += state.acceleration;
-                               state_speed[state.state] += state.speed;
+                               state_accel_speed[state.state] += state.accel_speed;
                                state_baro_speed[state.state] += state.baro_speed;
                                state_count[state.state]++;
                                if (state_start[state.state] == 0.0)
@@ -140,8 +131,8 @@ public class AltosFlightStats {
                                if (state_end[state.state] < state.time)
                                        state_end[state.state] = state.time;
                                max_height = state.max_height;
-                               if (state.max_speed != 0)
-                                       max_speed = state.max_speed;
+                               if (state.max_accel_speed != 0)
+                                       max_speed = state.max_accel_speed;
                                else
                                        max_speed = state.max_baro_speed;
                                max_acceleration = state.max_acceleration;
@@ -149,7 +140,7 @@ public class AltosFlightStats {
                }
                for (int s = Altos.ao_flight_startup; s <= Altos.ao_flight_landed; s++) {
                        if (state_count[s] > 0) {
-                               state_speed[s] /= state_count[s];
+                               state_accel_speed[s] /= state_count[s];
                                state_baro_speed[s] /= state_count[s];
                                state_accel[s] /= state_count[s];
                        }