Merge pull request #5 from macocci7/dev_1.0.2

#4: Refactor codes to follow psr12.

Author: macocci7

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "macocci7/php-scatterplot",
     "description": "it's easy to use for creating scatter plots.",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "type": "library",
     "license": "MIT",
     "autoload": {
@@ -18,6 +18,11 @@
     "minimum-stability": "stable",
     "require": {
         "intervention/image": "^2.7",
-        "macocci7/php-frequency-table": "^1.1"
+        "macocci7/php-frequency-table": "^1.1",
+        "macocci7/php-csv": "^1.0",
+        "macocci7/php-combination": "^1.0"
+    },
+    "require-dev": {
+        "squizlabs/php_codesniffer": "^3.7"
     }
 }

composer.lock

@@ -1,4 +1,5 @@
 <?php
+
 require('../vendor/autoload.php');
 
 use Macocci7\PhpScatterplot\Scatterplot;

example/BasicUsage.php

@@ -1,4 +1,5 @@
 <?php
+
 require('../vendor/autoload.php');
 
 use Macocci7\PhpScatterplot\Scatterplot;

example/ChangingProperties.php

@@ -1,20 +1,18 @@
 <?php
+
 require('../vendor/autoload.php');
-require('./class/CsvUtil.php');
-require('./class/Combination.php');
 
-use Macocci7\CsvUtil;
-use Macocci7\Combination;
 use Macocci7\PhpScatterplot\Scatterplot;
+use Macocci7\PhpCsv\Csv;
+use Macocci7\PhpCombination\Combination;
 
-$cu = new CsvUtil();
+$cu = new Csv('csv/weather_tokyo.csv');
 $cb = new Combination();
 
-$cu->load('csv/weather_tokyo.csv')
-   ->encode('SJIS', 'UTF-8')
-   ->offset(7);
-$heads = $cu->heads(4);
-$days = $cu->raw()->column(0);
+$cu->encode('SJIS', 'UTF-8')
+   ->offsetRow(7);
+$heads = $cu->row(5);
+$days = $cu->raw()->column(1);
 
 $dictionary = [
     '平均気温(℃)' => 'Mean Temperature(℃)',
@@ -24,7 +22,7 @@
     '降水量の合計(mm)' => 'Precipitation Amount(mm)',
     '平均現地気圧(hPa)' => 'Mean Local Air Pressure(hPa)',
 ];
-$columns = [1, 4, 7, 10, 14, 21];
+$columns = [2, 5, 8, 11, 15, 22];
 $parsed = [];
 $pairs = $cb->pairs($columns);
 foreach ($pairs as $index => $pair) {
@@ -36,7 +34,7 @@
             'y' => $cu->float()->column($y),
         ],
     ];
-    
+
     $sp = new Scatterplot();
     $sp->layers($layers)
        ->regressionLineOn()
@@ -50,7 +48,9 @@
 // Markdown -------------------------------------
 
 echo "# Scatterplot Matrix: Weather in Tokyo\n\n";
-echo "## Data Source\n\n<a href='https://www.data.jma.go.jp/gmd/risk/obsdl/' target='_blank'>Japan Meteorological Agency</a>\n\n";
+echo "## Data Source\n\n"
+   . "<a href='https://www.data.jma.go.jp/gmd/risk/obsdl/' target='_blank'>"
+   . "Japan Meteorological Agency</a>\n\n";
 echo "## Period: " . $days[0] . '～' . $days[count($days) - 1] . "\n";
 $count = count($columns);
 echo "<table>\n";

example/Matrix.php

@@ -1,4 +1,5 @@
 <?php
+
 require('../vendor/autoload.php');
 
 use Macocci7\PhpScatterplot\Analyzer;

example/ParsedData.php

@@ -1,4 +1,5 @@
 <?php
+
 require('../vendor/autoload.php');
 
 use Macocci7\PhpScatterplot\Scatterplot;