mirror of
				https://github.com/furyfire/trueskill.git
				synced 2025-11-04 02:02:29 +01:00 
			
		
		
		
	Some tests converted to new syntax
This commit is contained in:
		@@ -12,14 +12,14 @@ class GaussianDistributionTest extends TestCase
 | 
				
			|||||||
    {
 | 
					    {
 | 
				
			||||||
        // Verified with WolframAlpha
 | 
					        // Verified with WolframAlpha
 | 
				
			||||||
        // (e.g. http://www.wolframalpha.com/input/?i=CDF%5BNormalDistribution%5B0%2C1%5D%2C+0.5%5D )
 | 
					        // (e.g. http://www.wolframalpha.com/input/?i=CDF%5BNormalDistribution%5B0%2C1%5D%2C+0.5%5D )
 | 
				
			||||||
        $this->assertEquals(0.691462, GaussianDistribution::cumulativeTo(0.5), '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(0.691462, GaussianDistribution::cumulativeTo(0.5), GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function testAt()
 | 
					    public function testAt()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        // Verified with WolframAlpha
 | 
					        // Verified with WolframAlpha
 | 
				
			||||||
        // (e.g. http://www.wolframalpha.com/input/?i=PDF%5BNormalDistribution%5B0%2C1%5D%2C+0.5%5D )
 | 
					        // (e.g. http://www.wolframalpha.com/input/?i=PDF%5BNormalDistribution%5B0%2C1%5D%2C+0.5%5D )
 | 
				
			||||||
        $this->assertEquals(0.352065, GaussianDistribution::at(0.5), '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(0.352065, GaussianDistribution::at(0.5), GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function testMultiplication()
 | 
					    public function testMultiplication()
 | 
				
			||||||
@@ -29,8 +29,8 @@ class GaussianDistributionTest extends TestCase
 | 
				
			|||||||
        $shiftedGaussian = new GaussianDistribution(2, 3);
 | 
					        $shiftedGaussian = new GaussianDistribution(2, 3);
 | 
				
			||||||
        $product = GaussianDistribution::multiply($standardNormal, $shiftedGaussian);
 | 
					        $product = GaussianDistribution::multiply($standardNormal, $shiftedGaussian);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $this->assertEquals(0.2, $product->getMean(), '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(0.2, $product->getMean(), GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
        $this->assertEquals(3.0 / sqrt(10), $product->getStandardDeviation(), '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(3.0 / sqrt(10), $product->getStandardDeviation(), GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $m4s5 = new GaussianDistribution(4, 5);
 | 
					        $m4s5 = new GaussianDistribution(4, 5);
 | 
				
			||||||
        $m6s7 = new GaussianDistribution(6, 7);
 | 
					        $m6s7 = new GaussianDistribution(6, 7);
 | 
				
			||||||
@@ -38,10 +38,10 @@ class GaussianDistributionTest extends TestCase
 | 
				
			|||||||
        $product2 = GaussianDistribution::multiply($m4s5, $m6s7);
 | 
					        $product2 = GaussianDistribution::multiply($m4s5, $m6s7);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $expectedMean = (4 * BasicMath::square(7) + 6 * BasicMath::square(5)) / (BasicMath::square(5) + BasicMath::square(7));
 | 
					        $expectedMean = (4 * BasicMath::square(7) + 6 * BasicMath::square(5)) / (BasicMath::square(5) + BasicMath::square(7));
 | 
				
			||||||
        $this->assertEquals($expectedMean, $product2->getMean(), '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta($expectedMean, $product2->getMean(), GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $expectedSigma = sqrt(((BasicMath::square(5) * BasicMath::square(7)) / (BasicMath::square(5) + BasicMath::square(7))));
 | 
					        $expectedSigma = sqrt(((BasicMath::square(5) * BasicMath::square(7)) / (BasicMath::square(5) + BasicMath::square(7))));
 | 
				
			||||||
        $this->assertEquals($expectedSigma, $product2->getStandardDeviation(), '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta($expectedSigma, $product2->getStandardDeviation(), GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function testDivision()
 | 
					    public function testDivision()
 | 
				
			||||||
@@ -51,14 +51,14 @@ class GaussianDistributionTest extends TestCase
 | 
				
			|||||||
        $standardNormal = new GaussianDistribution(0, 1);
 | 
					        $standardNormal = new GaussianDistribution(0, 1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $productDividedByStandardNormal = GaussianDistribution::divide($product, $standardNormal);
 | 
					        $productDividedByStandardNormal = GaussianDistribution::divide($product, $standardNormal);
 | 
				
			||||||
        $this->assertEquals(2.0, $productDividedByStandardNormal->getMean(), '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(2.0, $productDividedByStandardNormal->getMean(), GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
        $this->assertEquals(3.0, $productDividedByStandardNormal->getStandardDeviation(), '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(3.0, $productDividedByStandardNormal->getStandardDeviation(), GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $product2 = new GaussianDistribution((4 * BasicMath::square(7) + 6 * BasicMath::square(5)) / (BasicMath::square(5) + BasicMath::square(7)), sqrt(((BasicMath::square(5) * BasicMath::square(7)) / (BasicMath::square(5) + BasicMath::square(7)))));
 | 
					        $product2 = new GaussianDistribution((4 * BasicMath::square(7) + 6 * BasicMath::square(5)) / (BasicMath::square(5) + BasicMath::square(7)), sqrt(((BasicMath::square(5) * BasicMath::square(7)) / (BasicMath::square(5) + BasicMath::square(7)))));
 | 
				
			||||||
        $m4s5 = new GaussianDistribution(4, 5);
 | 
					        $m4s5 = new GaussianDistribution(4, 5);
 | 
				
			||||||
        $product2DividedByM4S5 = GaussianDistribution::divide($product2, $m4s5);
 | 
					        $product2DividedByM4S5 = GaussianDistribution::divide($product2, $m4s5);
 | 
				
			||||||
        $this->assertEquals(6.0, $product2DividedByM4S5->getMean(), '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(6.0, $product2DividedByM4S5->getMean(), GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
        $this->assertEquals(7.0, $product2DividedByM4S5->getStandardDeviation(), '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(7.0, $product2DividedByM4S5->getStandardDeviation(), GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function testLogProductNormalization()
 | 
					    public function testLogProductNormalization()
 | 
				
			||||||
@@ -66,12 +66,12 @@ class GaussianDistributionTest extends TestCase
 | 
				
			|||||||
        // Verified with Ralf Herbrich's F# implementation
 | 
					        // Verified with Ralf Herbrich's F# implementation
 | 
				
			||||||
        $standardNormal = new GaussianDistribution(0, 1);
 | 
					        $standardNormal = new GaussianDistribution(0, 1);
 | 
				
			||||||
        $lpn = GaussianDistribution::logProductNormalization($standardNormal, $standardNormal);
 | 
					        $lpn = GaussianDistribution::logProductNormalization($standardNormal, $standardNormal);
 | 
				
			||||||
        $this->assertEquals(-1.2655121234846454, $lpn, '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(-1.2655121234846454, $lpn, GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $m1s2 = new GaussianDistribution(1, 2);
 | 
					        $m1s2 = new GaussianDistribution(1, 2);
 | 
				
			||||||
        $m3s4 = new GaussianDistribution(3, 4);
 | 
					        $m3s4 = new GaussianDistribution(3, 4);
 | 
				
			||||||
        $lpn2 = GaussianDistribution::logProductNormalization($m1s2, $m3s4);
 | 
					        $lpn2 = GaussianDistribution::logProductNormalization($m1s2, $m3s4);
 | 
				
			||||||
        $this->assertEquals(-2.5168046699816684, $lpn2, '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(-2.5168046699816684, $lpn2, GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function testLogRatioNormalization()
 | 
					    public function testLogRatioNormalization()
 | 
				
			||||||
@@ -80,7 +80,7 @@ class GaussianDistributionTest extends TestCase
 | 
				
			|||||||
        $m1s2 = new GaussianDistribution(1, 2);
 | 
					        $m1s2 = new GaussianDistribution(1, 2);
 | 
				
			||||||
        $m3s4 = new GaussianDistribution(3, 4);
 | 
					        $m3s4 = new GaussianDistribution(3, 4);
 | 
				
			||||||
        $lrn = GaussianDistribution::logRatioNormalization($m1s2, $m3s4);
 | 
					        $lrn = GaussianDistribution::logRatioNormalization($m1s2, $m3s4);
 | 
				
			||||||
        $this->assertEquals(2.6157405972171204, $lrn, '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(2.6157405972171204, $lrn, GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function testAbsoluteDifference()
 | 
					    public function testAbsoluteDifference()
 | 
				
			||||||
@@ -88,11 +88,11 @@ class GaussianDistributionTest extends TestCase
 | 
				
			|||||||
        // Verified with Ralf Herbrich's F# implementation
 | 
					        // Verified with Ralf Herbrich's F# implementation
 | 
				
			||||||
        $standardNormal = new GaussianDistribution(0, 1);
 | 
					        $standardNormal = new GaussianDistribution(0, 1);
 | 
				
			||||||
        $absDiff = GaussianDistribution::absoluteDifference($standardNormal, $standardNormal);
 | 
					        $absDiff = GaussianDistribution::absoluteDifference($standardNormal, $standardNormal);
 | 
				
			||||||
        $this->assertEquals(0.0, $absDiff, '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(0.0, $absDiff, GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $m1s2 = new GaussianDistribution(1, 2);
 | 
					        $m1s2 = new GaussianDistribution(1, 2);
 | 
				
			||||||
        $m3s4 = new GaussianDistribution(3, 4);
 | 
					        $m3s4 = new GaussianDistribution(3, 4);
 | 
				
			||||||
        $absDiff2 = GaussianDistribution::absoluteDifference($m1s2, $m3s4);
 | 
					        $absDiff2 = GaussianDistribution::absoluteDifference($m1s2, $m3s4);
 | 
				
			||||||
        $this->assertEquals(0.4330127018922193, $absDiff2, '', GaussianDistributionTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta(0.4330127018922193, $absDiff2, GaussianDistributionTest::ERROR_TOLERANCE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -19,6 +19,6 @@ class DrawMarginTest extends TestCase
 | 
				
			|||||||
    private function assertDrawMargin($drawProbability, $beta, $expected)
 | 
					    private function assertDrawMargin($drawProbability, $beta, $expected)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $actual = DrawMargin::getDrawMarginFromDrawProbability($drawProbability, $beta);
 | 
					        $actual = DrawMargin::getDrawMarginFromDrawProbability($drawProbability, $beta);
 | 
				
			||||||
        $this->assertEquals($expected, $actual, '', DrawMarginTest::ERROR_TOLERANCE);
 | 
					        $this->assertEqualsWithDelta($expected, $actual, DrawMarginTest::ERROR_TOLERANCE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
		Reference in New Issue
	
	Block a user