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

ifixing bug 1903 by changing getRaces(...) to getRace(...) and adjusting callers

Browse Source
This commit is contained in:
Axel Uhl
2014-07-08 18:21:12 +02:00
parent 2d723df9cc
commit df2331ed3d
15 changed files with 84 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/RaceDataAccessEval.java
+22 -37
View File
@@ -5,7 +5,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Iterator;
import java.util.Set;
import java.util.logging.Logger;
import com.sap.sailing.domain.base.Competitor;
@@ -103,45 +102,31 @@ public class RaceDataAccessEval {
service = new RacingEventServiceImpl();
tracTracAdapterFactory = new TracTracAdapterFactoryImpl();
logger.info("Calling service.addTracTracRace");
raceHandle = SimulatorUtils.loadRace(service, tracTracAdapterFactory, paramUrl, liveUri, storedUri, null,
60000);
raceHandle = SimulatorUtils.loadRace(service, tracTracAdapterFactory, paramUrl, liveUri, storedUri, null, 60000);
logger.info("Calling raceHandle.getRaces(): " + raceHandle);
Set<RaceDefinition> races = raceHandle.getRaces(); // wait for RaceDefinition to be completely wired in Regatta
logger.info("Obtained races: " + races.size());
RaceDefinition race = raceHandle.getRace(); // wait for RaceDefinition to be completely wired in Regatta
logger.info("Obtained race: " + race);
String regatta = raceHandle.getRegatta().getName();
Iterator<RaceDefinition> racIter = races.iterator();
while (racIter.hasNext()) {
RaceDefinition race = racIter.next();
System.out.println("Race: \"" + race.getName() + "\", \"" + regatta + "\"");
RegattaAndRaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, race.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
tr.waitUntilNotLoading();
System.out.println("Competitors:");
Iterable<Competitor> competitors = tr.getRace().getCompetitors();
System.out.println("" + competitors);
Iterator<Competitor> comIter = competitors.iterator();
while (comIter.hasNext()) {
Competitor com = comIter.next();
GPSFixTrack<Competitor, GPSFixMoving> track = null;
Iterable<GPSFixMoving> fixes = null;
track = tr.getTrack(com);
track.lockForRead();
fixes = track.getFixes();
GPSFixMoving fix = fixes.iterator().next();
System.out.println("" + com.getName() + ", First GPS-Fix: " + fix.getPosition().getLatDeg() + ", "
+ fix.getPosition().getLngDeg());
track.unlockAfterRead();
}
System.out.println("Race: \"" + race.getName() + "\", \"" + regatta + "\"");
RegattaAndRaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, race.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
tr.waitUntilNotLoading();
System.out.println("Competitors:");
Iterable<Competitor> competitors = tr.getRace().getCompetitors();
System.out.println("" + competitors);
Iterator<Competitor> comIter = competitors.iterator();
while (comIter.hasNext()) {
Competitor com = comIter.next();
GPSFixTrack<Competitor, GPSFixMoving> track = null;
Iterable<GPSFixMoving> fixes = null;
track = tr.getTrack(com);
track.lockForRead();
fixes = track.getFixes();
GPSFixMoving fix = fixes.iterator().next();
System.out.println("" + com.getName() + ", First GPS-Fix: " + fix.getPosition().getLatDeg() + ", "
+ fix.getPosition().getLngDeg());
track.unlockAfterRead();
}
}
}
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/RacingEventPersistence.java
+5 -11
View File
@@ -9,7 +9,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.RaceDefinition;
@@ -59,17 +58,12 @@ public class RacingEventPersistence {
System.out.println("Done loading race.");
String regatta = raceHandle.getRegatta().getName();
Set<RaceDefinition> races = raceHandle.getRaces();
RaceDefinition race = raceHandle.getRace();
List<TrackedRace> racesList = new ArrayList<TrackedRace>();
for (RaceDefinition r : races) {
RegattaAndRaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, r.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
tr.waitUntilNotLoading();
racesList.add(tr);
}
RegattaAndRaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, race.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
tr.waitUntilNotLoading();
racesList.add(tr);
FileOutputStream f_os = new FileOutputStream(regatta + ".data");
ObjectOutputStream os = new ObjectOutputStream(f_os);
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/TracTracReaderFromURLs.java
+5 -15
View File
@@ -4,7 +4,6 @@ import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import com.sap.sailing.domain.base.RaceDefinition;
import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
@@ -54,7 +53,6 @@ public class TracTracReaderFromURLs implements TracTracReader {
@Override
public List<TrackedRace> read() throws Exception {
// TODO Auto-generated method stub
System.setProperty("mongo.port", mongoPortStr);
System.setProperty("http.proxyHost", proxyHostStr);
System.setProperty("http.proxyPort", proxyPortStr);
@@ -62,26 +60,18 @@ public class TracTracReaderFromURLs implements TracTracReader {
final TracTracAdapterFactory tracTracAdapterFactory = new TracTracAdapterFactoryImpl();
URI liveURI = new URI(liveURIStr);
URI storedURI = new URI(storedURIStr);
List<TrackedRace> racesList = new ArrayList<TrackedRace>();
for (String paramURLStr : tracTracParamURLs) {
URL paramURL = new URL(paramURLStr);
RaceHandle raceHandle = SimulatorUtils.loadRace(service, tracTracAdapterFactory, paramURL, liveURI, storedURI,
null, 60000);
String regatta = raceHandle.getRegatta().getName();
Set<RaceDefinition> races = raceHandle.getRaces();
for (RaceDefinition r : races) {
RegattaAndRaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, r.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
tr.waitUntilNotLoading();
racesList.add(tr);
}
RaceDefinition r = raceHandle.getRace();
RegattaAndRaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, r.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
tr.waitUntilNotLoading();
racesList.add(tr);
}
return racesList;
}
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/TracTracWriter.java
+5 -11
View File
@@ -6,7 +6,6 @@ import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import com.sap.sailing.domain.base.RaceDefinition;
import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
@@ -45,17 +44,12 @@ public class TracTracWriter {
RaceHandle raceHandle = SimulatorUtils.loadRace(service, tracTracAdapterFactory, paramURL, liveURI, storedURI,
null, 60000);
String regatta = raceHandle.getRegatta().getName();
Set<RaceDefinition> races = raceHandle.getRaces();
RaceDefinition r = raceHandle.getRace();
List<TrackedRace> racesList = new ArrayList<TrackedRace>();
for (RaceDefinition r : races) {
RegattaAndRaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, r.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
tr.waitUntilNotLoading();
racesList.add(tr);
}
RegattaAndRaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, r.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
tr.waitUntilNotLoading();
racesList.add(tr);
System.out.println("start writing");
// TODO: naming convention
FileOutputStream f_os = new FileOutputStream(regatta + "race name" + ".data");