eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-25 06:58:39 +00:00
Code Activity

moved identification of devices that may have wind data to IgtimiConnectionImpl

Browse Source
This commit is contained in:
Axel Uhl
2014-01-30 10:12:30 +01:00
parent 3af44bb9f2
commit 3e1b5501a2
3 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/IgtimiConnection.java
+6
View File
@@ -154,6 +154,12 @@ public interface IgtimiConnection {
*/
Map<TrackedRace, Integer> importWindIntoRace(Iterable<DynamicTrackedRace> trackedRaces) throws IllegalStateException,
ClientProtocolException, IOException, ParseException;
/**
* Find all the devices from which we may read and which have logged GPS positions and apparent wind speed (AWS) or that
* have never logged GPS nor wind (probably new sensors)
*/
Iterable<String> getWindDevices() throws IllegalStateException, ClientProtocolException, IOException, ParseException;
/**
* Returns the latest datum for the specified devices that contains a fix of the <code>type</code> requested. The
java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/impl/IgtimiConnectionImpl.java
+39
View File
@@ -287,4 +287,43 @@ public class IgtimiConnectionImpl implements IgtimiConnection {
}
return false;
}
@Override
public Iterable<String> getWindDevices() throws IllegalStateException, ClientProtocolException, IOException, ParseException {
// find all the devices from which we may read
Iterable<DataAccessWindow> dataAccessWindows = getDataAccessWindows(
Permission.read, /* start time */ null, /* end time */ null,
/* get data for all available deviceSerialNumbers */null);
Set<String> deviceSerialNumbersWeCanRead = new HashSet<>();
for (DataAccessWindow daw : dataAccessWindows) {
deviceSerialNumbersWeCanRead.add(daw.getDeviceSerialNumber());
}
// find all that haven't even sent GPS; those may never have sent ever, so we need to listen to them for new stuff; they could be wind sensors
Iterable<Fix> gpsFixes = getLatestFixes(deviceSerialNumbersWeCanRead, Type.gps_latlong);
Set<String> devicesWithGps = getDeviceSerialNumbers(gpsFixes);
Iterable<Fix> awsFixes = getLatestFixes(deviceSerialNumbersWeCanRead, Type.AWS); // look for latest fixes with apparent wind speed in the fix
Set<String> devicesWithWind = getDeviceSerialNumbers(awsFixes);
Set<String> devicesThatHaveNeverSentGpsNorWind = new HashSet<>(deviceSerialNumbersWeCanRead);
devicesThatHaveNeverSentGpsNorWind.removeAll(devicesWithGps);
devicesThatHaveNeverSentGpsNorWind.removeAll(devicesWithWind);
Set<String> devicesWeShouldListenTo = new HashSet<>();
devicesWeShouldListenTo.addAll(devicesWithWind);
devicesWeShouldListenTo.addAll(devicesThatHaveNeverSentGpsNorWind);
logger.info("Wind devices identified: "
+ devicesWeShouldListenTo
+ " because from all devices "+deviceSerialNumbersWeCanRead+" for "
+ devicesThatHaveNeverSentGpsNorWind
+ " we don't know what they are as they never sent anything we can access, and for "
+ devicesWithWind + " we know they sent wind");
return devicesWeShouldListenTo;
}
private Set<String> getDeviceSerialNumbers(Iterable<Fix> fixes) {
Set<String> deviceSerialNumbers = new HashSet<>();
for (Fix fix : fixes) {
deviceSerialNumbers.add(fix.getSensor().getDeviceSerialNumber());
}
return deviceSerialNumbers;
}
}
java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/impl/IgtimiWindTracker.java
+4 -42
View File
@@ -4,10 +4,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -15,13 +13,9 @@ import com.sap.sailing.domain.common.TimePoint;
import com.sap.sailing.domain.common.impl.MillisecondsTimePoint;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.domain.igtimiadapter.Account;
import com.sap.sailing.domain.igtimiadapter.DataAccessWindow;
import com.sap.sailing.domain.igtimiadapter.IgtimiConnection;
import com.sap.sailing.domain.igtimiadapter.IgtimiConnectionFactory;
import com.sap.sailing.domain.igtimiadapter.LiveDataConnection;
import com.sap.sailing.domain.igtimiadapter.Permission;
import com.sap.sailing.domain.igtimiadapter.datatypes.Fix;
import com.sap.sailing.domain.igtimiadapter.datatypes.Type;
import com.sap.sailing.domain.tracking.AbstractWindTracker;
import com.sap.sailing.domain.tracking.DynamicTrackedRace;
import com.sap.sailing.domain.tracking.WindTracker;
@@ -30,7 +24,7 @@ public class IgtimiWindTracker extends AbstractWindTracker implements WindTracke
private static final Logger logger = Logger.getLogger(IgtimiWindTracker.class.getName());
private static final int TIME_INTERVAL_TO_TRACK_BEFORE_RACE_START_MILLIS = 10*60*1000; // 10 minutes
private static final long TIME_INTERVAL_TO_TRACK_AFTER_END_OF_RACE_MILLIS = 60*60*1000; // 60 minutes
private final Map<LiveDataConnection, Pair<Set<String>, Account>> liveConnectionsAndDeviceSerialNumber;
private final Map<LiveDataConnection, Pair<Iterable<String>, Account>> liveConnectionsAndDeviceSerialNumber;
private final IgtimiWindTrackerFactory windTrackerFactory;
private boolean stopping;
@@ -49,37 +43,13 @@ public class IgtimiWindTracker extends AbstractWindTracker implements WindTracke
try {
if (!stopping) {
IgtimiConnection connection = connectionFactory.connect(account);
// find all the devices from which we may read
Iterable<DataAccessWindow> dataAccessWindows = connection.getDataAccessWindows(
Permission.read, /* start time */ null, /* end time */ null,
/* get data for all available deviceSerialNumbers */null);
Set<String> deviceSerialNumbersWeCanRead = new HashSet<>();
for (DataAccessWindow daw : dataAccessWindows) {
deviceSerialNumbersWeCanRead.add(daw.getDeviceSerialNumber());
}
// find all that haven't even sent GPS; those may never have sent ever, so we need to listen to them for new stuff; they could be wind sensors
Iterable<Fix> gpsFixes = connection.getLatestFixes(deviceSerialNumbersWeCanRead, Type.gps_latlong);
Set<String> devicesWithGps = getDeviceSerialNumbers(gpsFixes);
Iterable<Fix> awsFixes = connection.getLatestFixes(deviceSerialNumbersWeCanRead, Type.AWS); // look for latest fixes with apparent wind speed in the fix
Set<String> devicesWithWind = getDeviceSerialNumbers(awsFixes);
Set<String> devicesThatHaveNeverSentGpsNorWind = new HashSet<>(deviceSerialNumbersWeCanRead);
devicesThatHaveNeverSentGpsNorWind.removeAll(devicesWithGps);
devicesThatHaveNeverSentGpsNorWind.removeAll(devicesWithWind);
Set<String> devicesWeShouldListenTo = new HashSet<>();
devicesWeShouldListenTo.addAll(devicesWithWind);
devicesWeShouldListenTo.addAll(devicesThatHaveNeverSentGpsNorWind);
logger.info("Will listen to devices "
+ devicesWeShouldListenTo
+ " because from all devices "+deviceSerialNumbersWeCanRead+" for "
+ devicesThatHaveNeverSentGpsNorWind
+ " we don't know what they are as they never sent anything we can access, and for "
+ devicesWithWind + " we know they sent wind");
Iterable<String> devicesWeShouldListenTo = connection.getWindDevices();
if (!stopping) {
LiveDataConnection liveConnection = connection.createLiveConnection(devicesWeShouldListenTo);
IgtimiWindReceiver windReceiver = new IgtimiWindReceiver(devicesWeShouldListenTo);
liveConnection.addListener(windReceiver);
windReceiver.addListener(new WindListenerSendingToTrackedRace(Collections.singleton(getTrackedRace()), windTrackerFactory));
liveConnectionsAndDeviceSerialNumber.put(liveConnection, new Pair<Set<String>, Account>(devicesWeShouldListenTo, account));
liveConnectionsAndDeviceSerialNumber.put(liveConnection, new Pair<Iterable<String>, Account>(devicesWeShouldListenTo, account));
}
}
} catch (Exception e) {
@@ -92,14 +62,6 @@ public class IgtimiWindTracker extends AbstractWindTracker implements WindTracke
}.start();
}
private Set<String> getDeviceSerialNumbers(Iterable<Fix> fixes) {
Set<String> deviceSerialNumbers = new HashSet<>();
for (Fix fix : fixes) {
deviceSerialNumbers.add(fix.getSensor().getDeviceSerialNumber());
}
return deviceSerialNumbers;
}
public static TimePoint getReceivingEndTime(DynamicTrackedRace trackedRace) {
TimePoint endOfRace = trackedRace.getEndOfRace();
TimePoint endOfTracking = trackedRace.getEndOfTracking();
@@ -151,7 +113,7 @@ public class IgtimiWindTracker extends AbstractWindTracker implements WindTracke
logger.info("Stopping Igtimi live connection "+ldc);
ldc.stop();
} catch (Exception e) {
final Pair<Set<String>, Account> deviceSerialNumberAndAccount = liveConnectionsAndDeviceSerialNumber.get(ldc);
final Pair<Iterable<String>, Account> deviceSerialNumberAndAccount = liveConnectionsAndDeviceSerialNumber.get(ldc);
logger.log(Level.INFO,
"Exception trying to stop Igtimi live connection for wind receiver for race "
+ getTrackedRace().getRace() + " and device " + deviceSerialNumberAndAccount.getA()