From 349ea16f01bced107daf2fa070fb2b27517e8c2b Mon Sep 17 00:00:00 2001 From: Arkadiusz Kondas Date: Fri, 30 Sep 2016 14:02:08 +0200 Subject: [PATCH] Rename demo datasets and add Dataset suffix --- src/Phpml/Dataset/Demo/{Glass.php => GlassDataset.php} | 2 +- src/Phpml/Dataset/Demo/{Iris.php => IrisDataset.php} | 2 +- src/Phpml/Dataset/Demo/{Wine.php => WineDataset.php} | 2 +- .../Dataset/Demo/{GlassTest.php => GlassDatasetTest.php} | 6 +++--- .../Dataset/Demo/{IrisTest.php => IrisDatasetTest.php} | 6 +++--- .../Dataset/Demo/{WineTest.php => WineDatasetTest.php} | 6 +++--- tests/Phpml/Metric/AccuracyTest.php | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) rename src/Phpml/Dataset/Demo/{Glass.php => GlassDataset.php} (93%) rename src/Phpml/Dataset/Demo/{Iris.php => IrisDataset.php} (90%) rename src/Phpml/Dataset/Demo/{Wine.php => WineDataset.php} (91%) rename tests/Phpml/Dataset/Demo/{GlassTest.php => GlassDatasetTest.php} (74%) rename tests/Phpml/Dataset/Demo/{IrisTest.php => IrisDatasetTest.php} (74%) rename tests/Phpml/Dataset/Demo/{WineTest.php => WineDatasetTest.php} (75%) diff --git a/src/Phpml/Dataset/Demo/Glass.php b/src/Phpml/Dataset/Demo/GlassDataset.php similarity index 93% rename from src/Phpml/Dataset/Demo/Glass.php rename to src/Phpml/Dataset/Demo/GlassDataset.php index 2a3d7e2..aa591f3 100644 --- a/src/Phpml/Dataset/Demo/Glass.php +++ b/src/Phpml/Dataset/Demo/GlassDataset.php @@ -18,7 +18,7 @@ use Phpml\Dataset\CsvDataset; * 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 b/src/Phpml/Dataset/Demo/IrisDataset.php similarity index 90% rename from src/Phpml/Dataset/Demo/Iris.php rename to src/Phpml/Dataset/Demo/IrisDataset.php index 923f0ba..509d9f4 100644 --- a/src/Phpml/Dataset/Demo/Iris.php +++ b/src/Phpml/Dataset/Demo/IrisDataset.php @@ -12,7 +12,7 @@ use Phpml\Dataset\CsvDataset; * 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 b/src/Phpml/Dataset/Demo/WineDataset.php similarity index 91% rename from src/Phpml/Dataset/Demo/Wine.php rename to src/Phpml/Dataset/Demo/WineDataset.php index 3bc71a9..90ddfe4 100644 --- a/src/Phpml/Dataset/Demo/Wine.php +++ b/src/Phpml/Dataset/Demo/WineDataset.php @@ -12,7 +12,7 @@ use Phpml\Dataset\CsvDataset; * 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 b/tests/Phpml/Dataset/Demo/GlassDatasetTest.php similarity index 74% rename from tests/Phpml/Dataset/Demo/GlassTest.php rename to tests/Phpml/Dataset/Demo/GlassDatasetTest.php index d4f1313..7ce3d37 100644 --- a/tests/Phpml/Dataset/Demo/GlassTest.php +++ b/tests/Phpml/Dataset/Demo/GlassDatasetTest.php @@ -4,13 +4,13 @@ declare (strict_types = 1); 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 b/tests/Phpml/Dataset/Demo/IrisDatasetTest.php similarity index 74% rename from tests/Phpml/Dataset/Demo/IrisTest.php rename to tests/Phpml/Dataset/Demo/IrisDatasetTest.php index 354329e..8e27db0 100644 --- a/tests/Phpml/Dataset/Demo/IrisTest.php +++ b/tests/Phpml/Dataset/Demo/IrisDatasetTest.php @@ -4,13 +4,13 @@ declare (strict_types = 1); 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 b/tests/Phpml/Dataset/Demo/WineDatasetTest.php similarity index 75% rename from tests/Phpml/Dataset/Demo/WineTest.php rename to tests/Phpml/Dataset/Demo/WineDatasetTest.php index 34c93fa..cf6c53d 100644 --- a/tests/Phpml/Dataset/Demo/WineTest.php +++ b/tests/Phpml/Dataset/Demo/WineDatasetTest.php @@ -4,13 +4,13 @@ declare (strict_types = 1); 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 index 6f28d94..436cb31 100644 --- a/tests/Phpml/Metric/AccuracyTest.php +++ b/tests/Phpml/Metric/AccuracyTest.php @@ -6,7 +6,7 @@ namespace tests\Phpml\Metric; 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 @@ class AccuracyTest extends \PHPUnit_Framework_TestCase 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());