small fix to ordering of HJ results when athlete has no jumps

Author: KicksTV

js/src/highjump.js

@@ -102,6 +102,9 @@ function Jumper(kwds) {
         failuresAtHeight = failuresBeforeAndAtHeight = this.attemptsByHeight[x].split('x').length - 1;
         for (i = 0; i < x; i++) failuresBeforeAndAtHeight += this.attemptsByHeight[i].split('x').length - 1;
       }
+      if (this.highestCleared === 0 && this.attemptsByHeight.length === 0) {
+        return [3, -0, 0, 0];
+      }
 
       return [
         this.eliminated ? (x < 0 ? 3 : 2) : (x < 0 ? 1 : 0),
@@ -175,6 +178,7 @@ function cmpKeys(a, b) {
   let ai;
   let bi;
 
+  // console.log('a, b', a, b);
   for (let i = 0; i < a.length; i++) {
     ai = a[i];
     bi = b[i];
@@ -222,7 +226,7 @@ function HighJumpCompetition() {
         );
       }
 
-      j._place = this.jumpers.length + 1;
+      // j._place = this.jumpers.length + 1;
 
       this.jumpersByBib[j.bib] = j;
       this.jumpers[this.jumpers.length] = j;
@@ -353,10 +357,18 @@ function HighJumpCompetition() {
       const rankjlen = rankj.length;
       let i;
 
+      // console.log('rankj before', rankj);
+
       for (i = 0; i < rankjlen; i++) rankj[i]._oldPos = i;
-      rankj.sort((a, b) =>
-        cmpKeys([a.rankingKey, a._oldPos], [b.rankingKey, b._oldPos])
-      );
+      rankj.sort(function (a, b) {
+        var r;
+
+        // console.log(a.first_name, b.first_name);
+        r = cmpKeys([a.rankingKey, a._oldPos], [b.rankingKey, b._oldPos]);
+
+        // console.log('result', r);
+        return r;
+      });
 
       let pk = null;
       let pj = null;
@@ -365,6 +377,8 @@ function HighJumpCompetition() {
         const j = rankj[i];
         const k = j.rankingKey;
 
+        // console.log(j);
+
         delete j._oldPos;
         if (i === 0) {
           j._place = 1;
@@ -374,6 +388,7 @@ function HighJumpCompetition() {
         pk = k;
         pj = j;
       }
+      // console.log('rankj after', rankj);
       return rankj;
     },
 
@@ -424,7 +439,16 @@ function HighJumpCompetition() {
               'won' :
               'finished';
         }
+      } else {
+        // Check for any athletes without jumps (should be eliminated)
+        rankj.forEach(j => {
+          // console.log(j.first_name + j.last_name, j.highestCleared === 0, j.attemptsByHeight.length === 0);
+          if (this.state === 'finished' && j.highestCleared === 0 && j.attemptsByHeight.length === 0) {
+            j.eliminated = true;
+          }
+        });
       }
+      // console.log('this.rankedJumpers', this.rankedJumpers);
     },
 
     displayBarHeight() {

js/test/highjump.spec.js

@@ -58,6 +58,16 @@ const matrix_a = [
 		["A",	"o",	"xxx",	"o",	"x",	"r"],
 		["B",	"o",	"xxx",	"o",	"x",	"r"],
 		]
+    
+const BELGRADE_INDOOR_HJ = [  // from here /en-gb/x/2022/SRB/belgradeindoor/event/F3/1/1/
+    ["place", "order", "bib", "first_name", "last_name", "team", "category", "5.01", "5.16", "5.31", "5.46", "5.61", "5.71", "5.81", "5.85", "6", "6.19", "best", "note"],
+    ["1", 1, 148, "Armand", "DUPLANTIS", "SWE", "M", "", "", "", "", "o", "", "", "o", "o", "xxo", 6.19, ""],
+    ["1", 1, 149, "Emanuoil", "KARALIS", "GRE", "M", "", "", "", "", "", "", "", "", "", "", 0, ""],
+    ["1", 1, 152, "Robert", "RENNER", "SLO", "M",  "", "xo", "xxo", "xxx", "", "", "", "", "", "", 5.31, ""],
+    ["1", 1, 153, "Ivan", "PARAVAC", "CRO", "M", "o", "o", "xxx", "", "", "", "", "", "", "", 5.16, ""],
+    ["1", 1, 150, "Bokai", "HUANG", "CHN", "M",  "", "", "", "xxx", "", "", "", "", "", "", 0, ""],
+    ["1", 1, 151, "Wenwen", "CHEN", "CHN", "M",  "", "", "xxx", "", "", "", "", "", "", "", 0, ""],
+    ];
 
 function createEmptyCompetition(matrix){
   //Creates from an array similar to above; named athletes with bibs
@@ -73,18 +83,18 @@ function createEmptyCompetition(matrix){
 
 describe('Given an instance of Athlib.HighJumpCompetition', function(){
   describe('Tests basic creation of athletes with names and bibs', function(){
-  var c=createEmptyCompetition(ESAA_2015_HJ);
-  it('last of jumpers should be named Dwyer',()=>{
-    expect(c.jumpers[c.jumpers.length-1].last_name).to.be.equal('Dwyer');
-    });
-  it('jumpersByBib[85] should be named Maslen',()=>{
-    expect(c.jumpersByBib[85].last_name).to.be.equal('Maslen');
-    });
+    var c=createEmptyCompetition(ESAA_2015_HJ);
+    it('last of jumpers should be named Dwyer',()=>{
+      expect(c.jumpers[c.jumpers.length-1].last_name).to.be.equal('Dwyer');
+      });
+    it('jumpersByBib[85] should be named Maslen',()=>{
+      expect(c.jumpersByBib[85].last_name).to.be.equal('Maslen');
+      });
   });
   describe('Tests progression',function(){
-  var c = createEmptyCompetition(ESAA_2015_HJ);
-  var h1 = 1.81;
-  c.setBarHeight(h1);
+    var c = createEmptyCompetition(ESAA_2015_HJ);
+    var h1 = 1.81;
+    c.setBarHeight(h1);
 
   // round 1
   c.cleared(85);
@@ -526,4 +536,27 @@ describe('Given an instance of Athlib.HighJumpCompetition', function(){
 	check("175 place 1, 193 place 1", 'r', 'r', 1, 1);
 	check("175 place 1, 193 place 1", 'x', 'x', 1, 1);
   });
+
+  describe('test result for BELGRADE INDOOR MEETING 2022',function(){
+    const c = Athlib.HighJumpCompetition.fromMatrix(BELGRADE_INDOOR_HJ);
+    c.state = 'finished' // pretend we simulated a HJ competition
+    // console.log(c)
+    c._rank()
+    var rank_aths = c.rankedJumpers
+
+    var emanuoil_karalis = rank_aths.find(ath => ath.bib === "149")
+    var wenwen_chen = rank_aths.find(ath => ath.bib === "151")
+
+
+    it("test ordering correct",()=>{ expect(rank_aths.map(r => r.bib)).deep.to.be.equal(["148", "152", "153", "150", "151", "149"]) });
+
+    it("test correct calc rankingKey", ()=>{ expect(emanuoil_karalis.rankingKey).deep.to.be.equal([ 3, -0, 0, 0 ]) })
+
+    it("test athlete is eliminated", ()=>{ expect(wenwen_chen.eliminated).to.be.equal(true) })
+
+    // athletes with no jump will be set as eliminted once the state is set to 'finished'
+    it("test athlete with no jumps is eliminated", ()=>{ expect(emanuoil_karalis.eliminated).to.be.equal(true) })
+
+    
+  });
 });