eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-10 21:02:40 +00:00
Code Activity

Added information on ORC-handicap to wiki and first structure for ORC JSON import.

Browse Source
This commit is contained in:
Daniel Lisunkin committed 2019-04-09 17:39:51 +02:00
1 parent 93c62750cd
commit bbb373e327
6 files changed
+285 -147
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestORCCertificateParser.java
+30 -30
View File
@@ -1,30 +1,30 @@
package com.sap.sailing.domain.ranking;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import org.junit.Test;
import com.sap.sailing.domain.ranking.ORCCertificateFile.ORCCertificateValues;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
public class TestORCCertificateParser {
private static final String RESOURCES = "resources/orc/";
@Test
public void testSimpleRMSFileRead() throws FileNotFoundException, IOException {
final File gerRms = new File(RESOURCES + "GER2016.rms");
ORCCertificateFile gerRmsFile = new ORCCertificateFile(new FileReader(gerRms));
assertNotNull(gerRmsFile);
assertTrue(gerRmsFile.getFileIds().contains("GER152487GER884"));
final ORCCertificateValues ger884 = gerRmsFile.getValuesForFileId("GER152487GER884");
assertNotNull(ger884);
assertEquals("DE DOOD", ger884.getValue("BUILDER"));
assertEquals("498.0", ger884.getValue("R9012"));
}
}
package com.sap.sailing.domain.ranking;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import org.junit.Test;
import com.sap.sailing.domain.ranking.ORCCertificateFile.ORCCertificateValues;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
public class TestORCCertificateParser {
private static final String RESOURCES = "resources/orc/";
@Test
public void testSimpleRMSFileRead() throws FileNotFoundException, IOException {
final File gerRms = new File(RESOURCES + "GER2016.rms");
ORCCertificateFile gerRmsFile = new ORCCertificateFile(new FileReader(gerRms));
assertNotNull(gerRmsFile);
assertTrue(gerRmsFile.getFileIds().contains("GER152487GER884"));
final ORCCertificateValues ger884 = gerRmsFile.getValuesForFileId("GER152487GER884");
assertNotNull(ger884);
assertEquals("DE DOOD", ger884.getValue("BUILDER"));
assertEquals("498.0", ger884.getValue("R9012"));
}
}
java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCCertificate.java
+5
View File
@@ -0,0 +1,5 @@
package com.sap.sailing.domain.ranking;
public class ORCCertificate {
}
java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCCertificateFile.java
+117 -117
View File
@@ -1,117 +1,117 @@
package com.sap.sailing.domain.ranking;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Represents a file in format {@code .rms} which is a simple ASCII file format, column-based, with fixed-width columns,
* defined by a header line that defines the names and for the first columns up to the column labeled
* {@link #NAME_OF_LAST_LEFT_ALIGNED_COLUMN_HEADER} also the width of the columns. The header uses column names that do
* not contain spaces, separated by one or more spaces. For the columns up to and including the column
* {@link #NAME_OF_LAST_LEFT_ALIGNED_COLUMN_HEADER} the column names are formatted left-aligned. For subsequent columns
* which contain all numeric values without spaces the column names may also be centered. For those columns parsing can
* simply split by space characters.
* <p>
*
* The result of successfully parsing a {@code .rms} file is a map keyed by the so-called national certificate file ID,
* with values being equal-sized maps from the column names to the {@link String} values. Additionally, the column names
* corresponding to the array indices can be queried.
*
* @author Axel Uhl (d043530)
*
*/
public class ORCCertificateFile {
private static final String NAME_OF_LAST_LEFT_ALIGNED_COLUMN_HEADER = "HH:MM:SS";
private final LinkedHashMap<String, Integer> columnNamesAndWidths;
private final Map<String, Map<String, String>> certificateValuesByFileId;
public class ORCCertificateValues {
private final String fileId;
public ORCCertificateValues(String fileId) {
super();
this.fileId = fileId;
}
public String getValue(String columnName) {
assert columnNamesAndWidths.containsKey(columnName);
return certificateValuesByFileId.get(fileId).get(columnName);
}
}
public ORCCertificateFile(Reader reader) throws IOException {
final BufferedReader br = new BufferedReader(reader);
columnNamesAndWidths = readColumnWidthsFromFirstLine(br.readLine());
final String fileIdColumnName = columnNamesAndWidths.keySet().iterator().next();
certificateValuesByFileId = new HashMap<>();
String line;
while ((line = br.readLine()) != null) {
final Map<String, String> parsedLine = parseLine(line);
certificateValuesByFileId.put(parsedLine.get(fileIdColumnName), parsedLine);
}
}
private Map<String, String> parseLine(final String line) {
assert columnNamesAndWidths != null;
final Map<String, String> result = new LinkedHashMap<>();
int start=0;
boolean splitBySpaceMode = false; // start using column names; switch to splitting by spaces when NAME_OF_LAST_LEFT_ALIGNED_COLUMN_HEADER has been found
for (final Entry<String, Integer> columnNameAndWidth : columnNamesAndWidths.entrySet()) {
final int end;
if (splitBySpaceMode) {
boolean foundSpace = false;
int i;
for (i=start; i<line.length() && (!foundSpace || line.charAt(i) == ' '); i++) {
if (!foundSpace) {
foundSpace = line.charAt(i) == ' ';
}
}
end = i;
} else {
end = start+columnNameAndWidth.getValue();
}
result.put(columnNameAndWidth.getKey(), line.substring(start, end).trim());
if (columnNameAndWidth.getKey().equals(NAME_OF_LAST_LEFT_ALIGNED_COLUMN_HEADER)) {
splitBySpaceMode = true;
}
start = end;
}
return result;
}
private LinkedHashMap<String, Integer> readColumnWidthsFromFirstLine(final String readLine) {
final LinkedHashMap<String, Integer> result = new LinkedHashMap<>();
final Pattern p = Pattern.compile("([^ ]+ *)");
final Matcher m = p.matcher(readLine);
int start = 0;
while (m.find(start)) {
result.put(m.group(1).trim(), m.group(1).length());
start += m.group(1).length();
}
return result;
}
public Set<String> getColumnNames() {
return Collections.unmodifiableSet(columnNamesAndWidths.keySet());
}
public Set<String> getFileIds() {
return Collections.unmodifiableSet(certificateValuesByFileId.keySet());
}
public ORCCertificateValues getValuesForFileId(String fileId) {
return certificateValuesByFileId.containsKey(fileId) ? new ORCCertificateValues(fileId) : null;
}
}
package com.sap.sailing.domain.ranking;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Represents a file in format {@code .rms} which is a simple ASCII file format, column-based, with fixed-width columns,
* defined by a header line that defines the names and for the first columns up to the column labeled
* {@link #NAME_OF_LAST_LEFT_ALIGNED_COLUMN_HEADER} also the width of the columns. The header uses column names that do
* not contain spaces, separated by one or more spaces. For the columns up to and including the column
* {@link #NAME_OF_LAST_LEFT_ALIGNED_COLUMN_HEADER} the column names are formatted left-aligned. For subsequent columns
* which contain all numeric values without spaces the column names may also be centered. For those columns parsing can
* simply split by space characters.
* <p>
*
* The result of successfully parsing a {@code .rms} file is a map keyed by the so-called national certificate file ID,
* with values being equal-sized maps from the column names to the {@link String} values. Additionally, the column names
* corresponding to the array indices can be queried.
*
* @author Axel Uhl (d043530)
*
*/
public class ORCCertificateFile {
private static final String NAME_OF_LAST_LEFT_ALIGNED_COLUMN_HEADER = "HH:MM:SS";
private final LinkedHashMap<String, Integer> columnNamesAndWidths;
private final Map<String, Map<String, String>> certificateValuesByFileId;
public class ORCCertificateValues {
private final String fileId;
public ORCCertificateValues(String fileId) {
super();
this.fileId = fileId;
}
public String getValue(String columnName) {
assert columnNamesAndWidths.containsKey(columnName);
return certificateValuesByFileId.get(fileId).get(columnName);
}
}
public ORCCertificateFile(Reader reader) throws IOException {
final BufferedReader br = new BufferedReader(reader);
columnNamesAndWidths = readColumnWidthsFromFirstLine(br.readLine());
final String fileIdColumnName = columnNamesAndWidths.keySet().iterator().next();
certificateValuesByFileId = new HashMap<>();
String line;
while ((line = br.readLine()) != null) {
final Map<String, String> parsedLine = parseLine(line);
certificateValuesByFileId.put(parsedLine.get(fileIdColumnName), parsedLine);
}
}
private Map<String, String> parseLine(final String line) {
assert columnNamesAndWidths != null;
final Map<String, String> result = new LinkedHashMap<>();
int start=0;
boolean splitBySpaceMode = false; // start using column names; switch to splitting by spaces when NAME_OF_LAST_LEFT_ALIGNED_COLUMN_HEADER has been found
for (final Entry<String, Integer> columnNameAndWidth : columnNamesAndWidths.entrySet()) {
final int end;
if (splitBySpaceMode) {
boolean foundSpace = false;
int i;
for (i=start; i<line.length() && (!foundSpace || line.charAt(i) == ' '); i++) {
if (!foundSpace) {
foundSpace = line.charAt(i) == ' ';
}
}
end = i;
} else {
end = start+columnNameAndWidth.getValue();
}
result.put(columnNameAndWidth.getKey(), line.substring(start, end).trim());
if (columnNameAndWidth.getKey().equals(NAME_OF_LAST_LEFT_ALIGNED_COLUMN_HEADER)) {
splitBySpaceMode = true;
}
start = end;
}
return result;
}
private LinkedHashMap<String, Integer> readColumnWidthsFromFirstLine(final String readLine) {
final LinkedHashMap<String, Integer> result = new LinkedHashMap<>();
final Pattern p = Pattern.compile("([^ ]+ *)");
final Matcher m = p.matcher(readLine);
int start = 0;
while (m.find(start)) {
result.put(m.group(1).trim(), m.group(1).length());
start += m.group(1).length();
}
return result;
}
public Set<String> getColumnNames() {
return Collections.unmodifiableSet(columnNamesAndWidths.keySet());
}
public Set<String> getFileIds() {
return Collections.unmodifiableSet(certificateValuesByFileId.keySet());
}
public ORCCertificateValues getValuesForFileId(String fileId) {
return certificateValuesByFileId.containsKey(fileId) ? new ORCCertificateValues(fileId) : null;
}
}
java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCCertificateImporter.java
+41
View File
@@ -0,0 +1,41 @@
package com.sap.sailing.domain.ranking;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Map;
import org.json.simple.*;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
public class ORCCertificateImporter {
private final JSONObject main;
ORCCertificateImporter (String url) {
main = readJsonFromUrl(url);
}
public static JSONObject readJsonFromUrl(String url) {
try (InputStream is = new URL(url).openStream();) {
Object obj = new JSONParser().parse(new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8)));
return (JSONObject) obj;
} catch (ParseException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return null;
}
private Map<String, JSONObject> createCertificateMap() {
return null;
}
}
java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCPerformanceCurveCertificate.java
+1
View File
@@ -96,6 +96,7 @@ public class ORCPerformanceCurveCertificate implements Serializable {
}
private Map<Speed, PolynomialFunctionLagrangeForm> createLagrangePolynomials() {
// TODO Interpolation should start with the Beat Angle, go over the fixed Values and end with the Downwind Angle
Map<Speed, PolynomialFunctionLagrangeForm> writeableLagrange = new HashMap<>();
for (Entry<Speed, Map<Bearing, Duration>> twsAndTwaToDuration : durationPerNauticalMileAtTrueWindAngleAndSpeed.entrySet()) {
final int numberOfTrueWindAngles = twsAndTwaToDuration.getValue().size();
wiki/howto/misc/orc-handicap.md
+91
View File
@@ -0,0 +1,91 @@
# ORC Handicap/Scoring System
To understand how a race is scored by the ORC system, read the following articles:
https://bugzilla.sapsailing.com/bugzilla/attachment.cgi?id=146
https://orc.org/index.asp?id=31
---
## ORC Certificate Information
The link to obtain the certificates for a country is
http://data.orc.org/public/WPub.dll?action=DownRMS&CountryId=GER
(in this case for three-letter IOC code "GER" for germany).
### Example Line
```
NATCERTN.FILE_ID SAILNUMB NAME TYPE BUILDER DESIGNER YEAR CLUB OWNER ADRS1 ADRS2 C_Type D CREW DD_MM_yyYY HH:MM:SS LOA IMSL DRAFT BMAX DSPL INDEX DA GPH TMF ILCGA PLT-O PLD-O WL6 WL8 WL10 WL12 WL14 WL16 WL20 OL6 OL8 OL10 OL12 OL14 OL16 OL20 CR6 CR8 CR10 CR12 CR14 CR16 CR20 NSP6 NSP8 NSP10 NSP12 NSP14 NSP16 NSP20 OC6 OC8 OC10 OC12 OC14 OC16 OC20 UA6 UA8 UA10 UA12 UA14 UA16 UA20 DA6 DA8 DA10 DA12 DA14 DA16 DA20 UP6 UP8 UP10 UP12 UP14 UP16 UP20 R526 R528 R5210 R5212 R5214 R5216 R5220 R606 R608 R6010 R6012 R6014 R6016 R6020 R756 R758 R7510 R7512 R7514 R7516 R7520 R906 R908 R9010 R9012 R9014 R9016 R9020 R1106 R1108 R11010 R11012 R11014 R11016 R11020 R1206 R1208 R12010 R12012 R12014 R12016 R12020 R1356 R1358 R13510 R13512 R13514 R13516 R13520 R1506 R1508 R15010 R15012 R15014 R15016 R15020 D6 D8 D10 D12 D14 D16 D20 OTNLOW OTNMED OTNHIG ITNLOW ITNMED ITNHIG DH_TOD DH_TOT PLT-I PLD-I TMF-OF PLT2H PLD2H OSN ReferenceNo CDL DSPS WSS MAIN GENOA SYM ASYM
GER140772GER5549 GER 5549 MOANA MARTEN 49 Mod MARTEN MARINE REICHEL/PUGH 2004 KYC DR. HANNO ZIEHM INTL R 900 21 04 2016 16:11:00 15.044 13.944 3.727 4.15 9704. 145.5 0.00 494.8 1.2435 542.8 0.862 46.1 808.5 651.3 568.7 527.0 505.2 483.4 445.9 769.3 622.2 550.8 513.9 489.7 468.2 443.0 677.6 548.7 480.5 440.9 415.6 397.2 369.2 739.4 592.8 513.1 465.4 434.6 413.2 384.9 834.5 645.6 540.0 475.7 433.1 401.8 354.6 42.9 41.8 39.8 38.0 37.3 36.4 36.1 141.9 143.3 147.4 152.4 151.7 148.1 142.1 832.5 678.5 609.2 579.2 562.1 546.1 536.7 542.7 449.4 420.0 409.5 403.5 397.8 389.9 508.1 429.9 406.8 397.2 391.0 386.5 374.1 478.1 416.9 393.7 377.9 368.4 361.9 350.3 478.8 418.0 393.2 370.5 351.3 339.6 328.2 488.5 414.1 392.5 376.2 359.5 344.0 304.5 507.0 420.3 387.7 367.2 350.6 335.9 302.4 567.4 453.3 407.7 379.9 349.5 318.8 282.1 679.3 540.5 457.6 410.6 388.3 364.3 307.5 784.4 624.1 528.3 474.9 448.4 420.6 355.1 1.2035 1.5321 1.7318 0.9248 1.2366 1.4217 487.4 1.2310 1.199 284.8 1.2439 0.873 56.8 482.4 GER20014417 13.620 11215 42.5 87.8 59.4 0.0 240.7
```
### Overview of Codes
| Code | Explanation |
| ----------------- | --------------------------------------- |
| NATCERTN.FILE_ID | National Certificate Number |
| SAILNUMB | Sailnumber |
| TYPE | Class |
| BUILDER | |
| DESIGNER | |
| YEAR | |
| CLUB | |
| OWNER | |
| ADRS1 | |
| ADRS2 | |
|||
| C_Type | Certificate Type (Club or International) |
| D | IMS Regulation Division (R = Performance, S, U, C = Racer, Sailboat, ? Cruiser) |
| CREW | Minimum Declared Crew Weight (in kg) |
| DD_MM_yyYY | Date of Issue |
| HH:MM:SS | Time of Issue |
| LOA | Length Overall
| IMSL | Freeboard
| DRAFT | Draft
| BMAX | Maximum Beam
| DSPL | Displacement
| INDEX | Stability Index
| DA | Dynamic Allowance (in %)
|||
| GPH | General Purpose Handicap (in s/nm Allowance)
| TMF-OF | Offshore Time-On-Time Value (in s/s)
| OSN | Offshore Time-On-Distance Value (in s/nm)
| TMF | Inshore Time-On-Time Value (in s/s)
| ILCGA | Inshore Time-On-Distance Value (in s/nm)
| PLT-O | Offshore Performance Line (PLT)
| PLD-O | Offshore Performance Line (PLD)
| PLT-I | Inshore Performance Line (PLT)
| PLD-I | Inshore Performance Line (PLD)
|||
| WL[6,8,10,12,14,16,20] | *Selected Courses:* **Windward/Leeward** Time Allowances for 6..20kt of Wind (in s/nm)
| OL[6,8,10,12,14,16,20] | *Selected Courses:* ??? Time Allowances for 6..20kt of Wind (in s/nm)
| CR[6,8,10,12,14,16,20] | *Selected Courses:* **Circular Random** Time Allowances for 6..20kt of Wind (in s/nm)
| NS[6,8,10,12,14,16,20] | *Selected Courses:* **Non Spinnaker** Time Allowances for 6..20kt of Wind (in s/nm)
| OC[6,8,10,12,14,16,20] | *Selected Courses:* **Ocean for PCS** Time Allowances for 6..20kt of Wind (in s/nm)
|||
| UA[6,8,10,12,14,16,20] | **Beat Angles** for 6..20kt of Wind
| DA[6,8,10,12,14,16,20] | **Gybe Angles** for 6..20kt of Wind (in s/nm)
|||
| UP[6,8,10,12,14,16,20] | **Upwind** Time Allowances for 6..20kt of Wind (in s/nm)
| R[52,60,75,90,110,120,135][6,8,10,12,14,16,20] | Time Allowances for 52..135° TWA with 6..20kt of Wind(in s/nm)
| D[6,8,10,12,14,16,20] | **Downwind** Time Allowances for 6..20kt of Wind (in s/nm)
|||
| OTNLOW/OTNMED/OTNHIG | Triple Number Offshore Low/Medium/High
| ITNLOW/ITNMED/ITNHIG | Triple Number Inshore Low/Medium/High
| DH_TOD | Double-Hand Time-On-Distance
| DH_TOT | Double-Hand Time-On-Time
| PLT2H | *???*
| PLD2H | *???*
|||
| ReferenceNo | ORC Reference Number
| CDL | Class Division Length
| DSPS | *???*
| WSS | Area of smallest jib (in m^2)
| MAIN | Area of Mainsail (in m^2)
| GENOA | Area of Genoa (in m^2)
| SYM | Area of symmetrical Spinnaker (in m^2)
| ASYM | Area of asymmetrical Spinnaker (in m^2)
---