Revert "Merge branch 'trophy2024' into main"

This reverts commit 6de960a, reversing changes made to 6798e87.
dennisfabri · Jul 5, 2024 · ef45fdc · ef45fdc
1 parent 6de960a
commit ef45fdc
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 112 deletions.
diff --git a/jauswertung-data/src/main/java/de/df/jauswertung/util/ergebnis/FormelILS.java b/jauswertung-data/src/main/java/de/df/jauswertung/util/ergebnis/FormelILS.java
@@ -115,7 +115,7 @@ public String getName() {
 
     @Override
     public String getDescription() {
-        return "Diese Punktevergabe entspricht der Punktevergabe für Indoorwettkämpfe der ILS ohne Finals";
+        return "Diese Punktevergabe entspricht der Punktevergabe für Indoorwettkämpfe der ILS ohne Finals";
     }
 
     private static final double Epsilon = 0.005;
@@ -405,18 +405,10 @@ protected double getPoints(int time, int rec, int rank, int amount, Strafe s, in
     protected static final int[] POINTS = new int[] { 20, 18, 16, 14, 13, 12, 11, 10, 8, 7, 6, 5, 4, 3, 2, 1 };
 
     protected double getPoints(int rank) {
-        return getPoints(rank, 1);
-    }
-
-    protected double getPoints(int rank, int amount) {
-        if (!((rank > 0) && (rank <= POINTS.length))) {
-            return 0;
-        }
-        double sum = 0;
-        for (int x = rank - 1; x < Math.min(rank + amount - 1, POINTS.length); x++) {
-            sum += POINTS[x];
+        if ((rank > 0) && (rank <= POINTS.length)) {
+            return POINTS[rank - 1];
         }
-        return Math.round(100.0 * sum / amount) / 100.0;
+        return 0;
     }
 
     @Override

diff --git a/jauswertung-io/src/test/resources/competitions/dem24/DEM2024_Einzel_Final_anonym.csv b/jauswertung-io/src/test/resources/competitions/dem24/DEM2024_Einzel_Final_anonym.csv
@@ -285,5 +285,5 @@
 4;"rhzvvrymbe, pncxcwlyzn";"rhzvvrymbe";"pncxcwlyzn";"";"kjihqfwbzv";"";"U19 - 50m Manikin Carry - Finale";"female";"65";20,00;14,00;6,00;"65";"nein";"50m Manikin Carry";4;0:38,07;14,00;" ";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";;
 5;"scipfobrxo, sosaqamlui";"scipfobrxo";"sosaqamlui";"";"yaeiigdptw";"";"U19 - 50m Manikin Carry - Finale";"female";"158";13,00;13,00;7,00;"158";"nein";"50m Manikin Carry";5;0:39,49;13,00;" ";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";;
 6;"xmtazezizw, mumybueqoi";"xmtazezizw";"mumybueqoi";"";"myelaiimqt";"";"U19 - 50m Manikin Carry - Finale";"female";"228";10,00;12,00;8,00;"228";"nein";"50m Manikin Carry";6;0:39,63;12,00;" ";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";;
-7;"xqdadyhxvj, rcnnjlebtw";"xqdadyhxvj";"rcnnjlebtw";"";"wedgvuqnyz";"";"U19 - 50m Manikin Carry - Finale";"female";"66";13,00;10,50;9,50;"66";"nein";"50m Manikin Carry";7;0:40,06;10,50;" ";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";;
-7;"aeblpgewfc, nxxcomlwbm";"aeblpgewfc";"nxxcomlwbm";"";"wapzlixhov";"";"U19 - 50m Manikin Carry - Finale";"female";"67";16,00;10,50;9,50;"67";"nein";"50m Manikin Carry";7;0:40,06;10,50;" ";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";;
+7;"xqdadyhxvj, rcnnjlebtw";"xqdadyhxvj";"rcnnjlebtw";"";"wedgvuqnyz";"";"U19 - 50m Manikin Carry - Finale";"female";"66";13,00;11,00;9,00;"66";"nein";"50m Manikin Carry";7;0:40,06;11,00;" ";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";;
+7;"aeblpgewfc, nxxcomlwbm";"aeblpgewfc";"nxxcomlwbm";"";"wapzlixhov";"";"U19 - 50m Manikin Carry - Finale";"female";"67";16,00;11,00;9,00;"67";"nein";"50m Manikin Carry";7;0:40,06;11,00;" ";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";;