try and fix ranking key computation; version --> 0.6.10

Author: replabrobin

athlib/__init__.py

@@ -6,7 +6,7 @@ def __wma_delay__():
 from .hungarian_score import score as hungarian_score
 from .athlon_score import performance as athlon_performance_needed
 
-__version__ = u'0.6.9'
+__version__ = u'0.6.10'
 
 from .exceptions import RuleViolation
 

athlib/highjump.py

@@ -94,7 +94,7 @@ def ranking_key(self) -> Tuple[int, Decimal, int, int]:
             failures_at_height = self.attempts_by_height[x].count('x')
             failures_before_and_at_height = failures_at_height + sum(_.count('x') for _ in self.attempts_by_height[:x])
         return (
-            (2 if self.eliminated else 1) if x<0 else 0,
+            (3 if x<0 else 2) if self.eliminated else (1 if x<0 else 0),
             - self.highest_cleared,
             failures_at_height,
             failures_before_and_at_height,

docs/source/conf.py

@@ -64,7 +64,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.6.9'
+version = u'0.6.10'
 # The full version, including alpha/beta/rc tags.
 release = version
 

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "athlib",
-  "version": "0.6.9",
+  "version": "0.6.10",
   "description": "Athletics Library",
   "main": "./index.js",
   "scripts": {

js/src/highjump.js

@@ -94,7 +94,7 @@ function Jumper(kwds) {
       }
 
       return [
-        x < 0 ? (this.eliminated ? 2 : 1) : 0,
+        this.eliminated ? (x < 0 ? 3 : 2) : (x < 0 ? 1 : 0),
         -this.highestCleared,
         failuresAtHeight,
         failuresBeforeAndAtHeight

js/test/highjump.spec.js

@@ -247,7 +247,7 @@ describe('Given an instance of Athlib.HighJumpCompetition', function(){
       }
     expect(r).to.be.equal(1);
     });
-  it("81 is not allowed to jump again",()=>{
+  it("B is not allowed to jump again",()=>{
     var r=0,e;
     try{
       c.failed('B');
@@ -268,8 +268,8 @@ describe('Given an instance of Athlib.HighJumpCompetition', function(){
   it("c.state == finished",()=>{expect(c.state).to.be.equal('finished')});
   it("A.highestCleared == 2.12",()=>{expect(A.highestCleared).to.be.equal(2.12)});
   it("B.highestCleared == 2.12",()=>{expect(B.highestCleared).to.be.equal(2.12)});
-  it("A.rankingKey == [0, -2.12, 1, 2]",()=>{expect(c._compareKeys(A.rankingKey,[0, -2.12, 1, 2])).to.be.equal(0)});
-  it("B.rankingKey == [0, -2.12, 2, 2]",()=>{expect(c._compareKeys(B.rankingKey,[0, -2.12, 2, 2])).to.be.equal(0)});
+  it("A.rankingKey == [0, -2.12, 1, 2]",()=>{expect(c._compareKeys(A.rankingKey,[2, -2.12, 1, 2])).to.be.equal(0)});
+  it("B.rankingKey == [0, -2.12, 2, 2]",()=>{expect(c._compareKeys(B.rankingKey,[2, -2.12, 2, 2])).to.be.equal(0)});
   });
   describe('Test total failure rank',function(){
     // Run through to where the jumpoff began - ninth bar position
@@ -302,7 +302,7 @@ describe('Given an instance of Athlib.HighJumpCompetition', function(){
   it("A.highestCleared == 2.08",()=>{expect(A.highestCleared).to.be.equal(2.08)});
   it("B.highestCleared == 0",()=>{expect(B.highestCleared).to.be.equal(0)});
   it("A.rankingKey == [0, -2.08, 0, 0]",()=>{expect(c._compareKeys(A.rankingKey,[0, -2.08, 0, 0])).to.be.equal(0)});
-  it("B.rankingKey == [2, -0, 0, 0]",()=>{expect(c._compareKeys(B.rankingKey,[2, -0, 0, 0])).to.be.equal(0)});
+  it("B.rankingKey == [2, -0, 0, 0]",()=>{expect(c._compareKeys(B.rankingKey,[3, -0, 0, 0])).to.be.equal(0)});
   });
   describe('Test countback to total failures',function(){
     // Run through to where the jumpoff began - ninth bar position
@@ -323,7 +323,7 @@ describe('Given an instance of Athlib.HighJumpCompetition', function(){
       }
     expect(r).to.be.equal(1);
     });
-  it("81 is not allowed to jump again",()=>{
+  it("B is not allowed to jump again",()=>{
     var r=0,e;
     try{
       c.failed('B');
@@ -344,8 +344,8 @@ describe('Given an instance of Athlib.HighJumpCompetition', function(){
   it("c.state == finished",()=>{expect(c.state).to.be.equal('finished')});
   it("A.highestCleared == 2.12",()=>{expect(A.highestCleared).to.be.equal(2.12)});
   it("B.highestCleared == 2.12",()=>{expect(B.highestCleared).to.be.equal(2.12)});
-  it("A.rankingKey == [0, -2.12, 1, 2]",()=>{expect(c._compareKeys(A.rankingKey,[0, -2.12, 1, 2])).to.be.equal(0)});
-  it("B.rankingKey == [0, -2.12, 1, 3]",()=>{expect(c._compareKeys(B.rankingKey,[0, -2.12, 1, 3])).to.be.equal(0)});
+  it("A.rankingKey == [0, -2.12, 1, 2]",()=>{expect(c._compareKeys(A.rankingKey,[2, -2.12, 1, 2])).to.be.equal(0)});
+  it("B.rankingKey == [0, -2.12, 1, 3]",()=>{expect(c._compareKeys(B.rankingKey,[2, -2.12, 1, 3])).to.be.equal(0)});
   });
   describe('Test won ending',function(){
 	it("test scheduled-->started-->won-->finished",()=>{

tests/test_highjump.py

@@ -185,8 +185,8 @@ def test_countback_to_tie(self):
         self.assertEqual(c.state, 'finished')
         self.assertEqual(A.highest_cleared, Decimal("2.12"))
         self.assertEqual(B.highest_cleared, Decimal("2.12"))
-        self.assertEqual(A.ranking_key,(0, Decimal('-2.12'), 1, 2))
-        self.assertEqual(B.ranking_key,(0, Decimal('-2.12'), 2, 2))
+        self.assertEqual(A.ranking_key,(2, Decimal('-2.12'), 1, 2))
+        self.assertEqual(B.ranking_key,(2, Decimal('-2.12'), 2, 2))
 
     def test_countback_total_failure_rank(self):
         "test_countback_total_failure_rank"
@@ -209,7 +209,7 @@ def test_countback_total_failure_rank(self):
         self.assertEqual(A.highest_cleared, Decimal("2.08"))
         self.assertEqual(B.highest_cleared, Decimal("0.00"))
         self.assertEqual(A.ranking_key,(0, Decimal('-2.08'), 0, 0))
-        self.assertEqual(B.ranking_key,(2, Decimal('0.00'), 0, 0))
+        self.assertEqual(B.ranking_key,(3, Decimal('0.00'), 0, 0))
 
     def test_countback_to_total_failures(self):
         "test_countback_to_total_failures"
@@ -232,8 +232,8 @@ def test_countback_to_total_failures(self):
         self.assertEqual(c.state, 'finished')
         self.assertEqual(A.highest_cleared, Decimal("2.12"))
         self.assertEqual(B.highest_cleared, Decimal("2.12"))
-        self.assertEqual(A.ranking_key,(0, Decimal('-2.12'), 1, 2))
-        self.assertEqual(B.ranking_key,(0, Decimal('-2.12'), 1, 3))
+        self.assertEqual(A.ranking_key,(2, Decimal('-2.12'), 1, 2))
+        self.assertEqual(B.ranking_key,(2, Decimal('-2.12'), 1, 3))
 
     def test_won_ending(self):
         "check the status changes at a won ending which finishes"