Rename demo datasets and add Dataset suffix

rk2810 · Sep 30, 2016 · 349ea16 · 349ea16
1 parent 84af842
commit 349ea16
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/src/Phpml/Dataset/Demo/Glass.php → src/Phpml/Dataset/Demo/GlassDataset.php b/src/Phpml/Dataset/Demo/Glass.php → src/Phpml/Dataset/Demo/GlassDataset.php
@@ -18,7 +18,7 @@
  * Samples total: 214
  * Features per sample: 9.
  */
-class Glass extends CsvDataset
+class GlassDataset extends CsvDataset
 {
     public function __construct()
     {

diff --git a/src/Phpml/Dataset/Demo/Iris.php → src/Phpml/Dataset/Demo/IrisDataset.php b/src/Phpml/Dataset/Demo/Iris.php → src/Phpml/Dataset/Demo/IrisDataset.php
@@ -12,7 +12,7 @@
  * Samples total: 150
  * Features per sample: 4.
  */
-class Iris extends CsvDataset
+class IrisDataset extends CsvDataset
 {
     public function __construct()
     {

diff --git a/src/Phpml/Dataset/Demo/Wine.php → src/Phpml/Dataset/Demo/WineDataset.php b/src/Phpml/Dataset/Demo/Wine.php → src/Phpml/Dataset/Demo/WineDataset.php
@@ -12,7 +12,7 @@
  * Samples total: 178
  * Features per sample: 13.
  */
-class Wine extends CsvDataset
+class WineDataset extends CsvDataset
 {
     public function __construct()
     {

diff --git a/tests/Phpml/Dataset/Demo/GlassTest.php → ...s/Phpml/Dataset/Demo/GlassDatasetTest.php b/tests/Phpml/Dataset/Demo/GlassTest.php → ...s/Phpml/Dataset/Demo/GlassDatasetTest.php
@@ -4,13 +4,13 @@
 
 namespace tests\Phpml\Dataset\Demo;
 
-use Phpml\Dataset\Demo\Glass;
+use Phpml\Dataset\Demo\GlassDataset;
 
-class GlassTest extends \PHPUnit_Framework_TestCase
+class GlassDatasetTest extends \PHPUnit_Framework_TestCase
 {
     public function testLoadingWineDataset()
     {
-        $glass = new Glass();
+        $glass = new GlassDataset();
 
         // whole dataset
         $this->assertEquals(214, count($glass->getSamples()));

diff --git a/tests/Phpml/Dataset/Demo/IrisTest.php → tests/Phpml/Dataset/Demo/IrisDatasetTest.php b/tests/Phpml/Dataset/Demo/IrisTest.php → tests/Phpml/Dataset/Demo/IrisDatasetTest.php
@@ -4,13 +4,13 @@
 
 namespace tests\Phpml\Dataset\Demo;
 
-use Phpml\Dataset\Demo\Iris;
+use Phpml\Dataset\Demo\IrisDataset;
 
-class IrisTest extends \PHPUnit_Framework_TestCase
+class IrisDatasetTest extends \PHPUnit_Framework_TestCase
 {
     public function testLoadingIrisDataset()
     {
-        $iris = new Iris();
+        $iris = new IrisDataset();
 
         // whole dataset
         $this->assertEquals(150, count($iris->getSamples()));

diff --git a/tests/Phpml/Dataset/Demo/WineTest.php → tests/Phpml/Dataset/Demo/WineDatasetTest.php b/tests/Phpml/Dataset/Demo/WineTest.php → tests/Phpml/Dataset/Demo/WineDatasetTest.php
@@ -4,13 +4,13 @@
 
 namespace tests\Phpml\Dataset\Demo;
 
-use Phpml\Dataset\Demo\Wine;
+use Phpml\Dataset\Demo\WineDataset;
 
-class WineTest extends \PHPUnit_Framework_TestCase
+class WineDatasetTest extends \PHPUnit_Framework_TestCase
 {
     public function testLoadingWineDataset()
     {
-        $wine = new Wine();
+        $wine = new WineDataset();
 
         // whole dataset
         $this->assertEquals(178, count($wine->getSamples()));

diff --git a/tests/Phpml/Metric/AccuracyTest.php b/tests/Phpml/Metric/AccuracyTest.php
@@ -6,7 +6,7 @@
 
 use Phpml\Classification\SVC;
 use Phpml\CrossValidation\RandomSplit;
-use Phpml\Dataset\Demo\Iris;
+use Phpml\Dataset\Demo\IrisDataset;
 use Phpml\Metric\Accuracy;
 use Phpml\SupportVectorMachine\Kernel;
 
@@ -41,7 +41,7 @@ public function testCalculateNotNormalizedScore()
 
     public function testAccuracyOnDemoDataset()
     {
-        $dataset = new RandomSplit(new Iris(), 0.5, 123);
+        $dataset = new RandomSplit(new IrisDataset(), 0.5, 123);
 
         $classifier = new SVC(Kernel::RBF);
         $classifier->train($dataset->getTrainSamples(), $dataset->getTrainLabels());