micropeak: Keep reading until we get valid data
[fw/altos] / micropeak / MicroData.java
index ec9b83d8179e0902bc82c74de968bfac996b9e54..e786ff1ed136de4e6800feb1263094f38af42a30 100644 (file)
@@ -20,9 +20,10 @@ package org.altusmetrum.micropeak;
 import java.lang.*;
 import java.io.*;
 import java.util.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_1.*;
 
-abstract class MicroIterator implements Iterator<Double> {
+class MicroIterator implements Iterator<MicroDataPoint> {
        int             i;
        MicroData       data;
 
@@ -30,6 +31,10 @@ abstract class MicroIterator implements Iterator<Double> {
                return i < data.pressures.length;
        }
 
+       public MicroDataPoint next() {
+               return new MicroDataPoint(data, i++);
+       }
+
        public MicroIterator (MicroData data) {
                this.data = data;
                i = 0;
@@ -39,86 +44,69 @@ abstract class MicroIterator implements Iterator<Double> {
        }
 }
 
-class MicroHeightIterator extends MicroIterator {
-       public Double next() {
-               return data.height(i++);
-       }
+class MicroIterable implements Iterable<MicroDataPoint> {
 
-       public MicroHeightIterator(MicroData data) {
-               super(data);
-       }
-}
-
-class MicroHeightIterable implements Iterable<Double> {
        MicroData       data;
 
-       public Iterator<Double> iterator() {
-               return new MicroHeightIterator(data);
+       public Iterator<MicroDataPoint> iterator() {
+               return new MicroIterator(data);
        }
 
-       public MicroHeightIterable(MicroData data) {
+       public MicroIterable(MicroData data) {
                this.data = data;
        }
 }
 
-class MicroSpeedIterator extends MicroIterator {
-       public Double next() {
-               return data.speed(i++);
-       }
-       public MicroSpeedIterator(MicroData data) {
-               super(data);
-       }
-}
-
-class MicroSpeedIterable implements Iterable<Double> {
+class MicroUIIterator implements Iterator<AltosUIDataPoint> {
+       int             i;
        MicroData       data;
 
-       public Iterator<Double> iterator() {
-               return new MicroSpeedIterator(data);
+       public boolean hasNext() {
+               return i < data.pressures.length;
        }
 
-       public MicroSpeedIterable(MicroData data) {
-               this.data = data;
+       public AltosUIDataPoint next() {
+               return new MicroDataPoint(data, i++);
        }
-}
 
-class MicroAccelIterator extends MicroIterator {
-       public Double next() {
-               return data.acceleration(i++);
+       public MicroUIIterator (MicroData data) {
+               this.data = data;
+               i = 0;
        }
-       public MicroAccelIterator(MicroData data) {
-               super(data);
+
+       public void remove() {
        }
 }
 
-class MicroAccelIterable implements Iterable<Double> {
+class MicroUIIterable implements Iterable<AltosUIDataPoint> {
        MicroData       data;
 
-       public Iterator<Double> iterator() {
-               return new MicroAccelIterator(data);
+       public Iterator<AltosUIDataPoint> iterator() {
+               return new MicroUIIterator(data);
        }
 
-       public MicroAccelIterable(MicroData data) {
+       public MicroUIIterable(MicroData data) {
                this.data = data;
        }
 }
 
-public class MicroData {
+public class MicroData implements AltosUIDataSet {
        public int              ground_pressure;
        public int              min_pressure;
        public int[]            pressures;
        private double          time_step;
        private double          ground_altitude;
        private ArrayList<Integer>      bytes;
+       String                  name;
+       MicroStats              stats;
        
-
-       class FileEndedException extends Exception {
+       public class FileEndedException extends Exception {
        }
 
-       class NonHexcharException extends Exception {
+       public class NonHexcharException extends Exception {
        }
 
-       class InvalidCrcException extends Exception {
+       public class InvalidCrcException extends Exception {
        }
 
        private int getc(InputStream f) throws IOException, FileEndedException {
@@ -179,14 +167,10 @@ public class MicroData {
                return h;
        }
 
-       private boolean find_header(InputStream f) throws IOException {
-               try {
-                       for (;;) {
-                               if (get_nonwhite(f) == 'M' && get_nonwhite(f) == 'P')
-                                       return true;
-                       }
-               } catch (FileEndedException fe) {
-                       return false;
+       private boolean find_header(InputStream f) throws IOException, FileEndedException {
+               for (;;) {
+                       if (get_nonwhite(f) == 'M' && get_nonwhite(f) == 'P')
+                               return true;
                }
        } 
 
@@ -224,16 +208,16 @@ public class MicroData {
                return AltosConvert.pressure_to_altitude(pressures[i]);
        }
 
-       public Iterable<Double> heights() {
-               return new MicroHeightIterable(this);
+       public String name() {
+               return name;
        }
 
-       public Iterable<Double> speeds() {
-               return new MicroSpeedIterable(this);
+       public Iterable<AltosUIDataPoint> dataPoints() {
+               return new MicroUIIterable(this);
        }
 
-       public Iterable<Double> accels() {
-               return new MicroAccelIterable(this);
+       public Iterable<MicroDataPoint> points() {
+               return new MicroIterable(this);
        }
 
        int fact(int n) {
@@ -275,10 +259,26 @@ public class MicroData {
                return alt;
        }
 
+       public double pressure(int i) {
+               return pressures[i];
+       }
+
        public double height(int i) {
                return altitude(i) - ground_altitude;
        }
 
+       public double apogee_pressure() {
+               return min_pressure;
+       }
+
+       public double apogee_altitude() {
+               return AltosConvert.pressure_to_altitude(apogee_pressure());
+       }
+
+       public double apogee_height() {
+               return apogee_altitude() - ground_altitude;
+       }
+
        static final int speed_avg = 3;
        static final int accel_avg = 5;
 
@@ -310,12 +310,36 @@ public class MicroData {
        public void save (OutputStream f) throws IOException {
                for (int c : bytes)
                        f.write(c);
+               f.write('\n');
+       }
+
+       public void export (Writer f) throws IOException {
+               PrintWriter     pw = new PrintWriter(f);
+               pw.printf("  Time, Press(Pa), Height(m), Height(f), Speed(m/s), Speed(mph), Speed(mach), Accel(m/s²), Accel(ft/s²),  Accel(g)\n");
+               for (MicroDataPoint point : points()) {
+                       pw.printf("%6.3f,%10.0f,%10.1f,%10.1f,%11.2f,%11.2f,%12.4f,%12.2f,%13.2f,%10.4f\n",
+                                 point.time,
+                                 point.pressure,
+                                 point.height,
+                                 AltosConvert.meters_to_feet(point.height),
+                                 point.speed,
+                                 AltosConvert.meters_to_mph(point.speed),
+                                 AltosConvert.meters_to_mach(point.speed),
+                                 point.accel,
+                                 AltosConvert.meters_to_feet(point.accel),
+                                 AltosConvert.meters_to_g(point.accel));
+               }
+       }
+
+       public void set_name(String name) {
+               this.name = name;
        }
 
-       public MicroData (InputStream f) throws IOException {
+       public MicroData (InputStream f, String name) throws IOException, InterruptedException, NonHexcharException, FileEndedException {
+               this.name = name;
                bytes = new ArrayList<Integer>();
                if (!find_header(f))
-                       throw new IOException();
+                       throw new IOException("No MicroPeak data header found");
                try {
                        file_crc = 0xffff;
                        ground_pressure = get_32(f);
@@ -353,10 +377,9 @@ public class MicroData {
                        crc_valid = crc == current_crc;
 
                        time_step = 0.192;
+                       stats = new MicroStats(this);
                } catch (FileEndedException fe) {
-                       throw new IOException();
-               } catch (NonHexcharException ne) {
-                       throw new IOException();
+                       throw new IOException("File Ended Unexpectedly");
                }
        }