added new unit: miles per imperial gallon(mpig)

src/UnitConverter/Calculator/Formula/FuelEconomy/KilometrePerLitre/ToLitrePer100Kilometres.php

@@ -24,6 +24,8 @@
  */
 class ToLitrePer100Kilometres extends AbstractFormula
 {
+    const MAGIC_NUMBER = 100;
+
     const FORMULA_STRING = 'L/100km = 100 / km/l';
 
     const FORMULA_TEMPLATE = '%s L/100km = 100 / %skm/l';
@@ -34,7 +36,7 @@ class ToLitrePer100Kilometres extends AbstractFormula
     public function describe($value, $fromUnits, $toUnits, int $precision = null)
     {
         // XXX: this formula assumes all calculators can accept strings, as it's the safest type.
-        $addResult = $this->calculator->div(100, $value);
+        $addResult = $this->calculator->div(self::MAGIC_NUMBER, $value);
         $result = $this->calculator->round($addResult, $precision);
 
         $this->plugVariables($result, $value);

src/UnitConverter/Calculator/Formula/FuelEconomy/KilometrePerLitre/ToMilesPerGallonImperial.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types = 1);
+
+/**
+ * This file is part of the jordanbrauer/unit-converter PHP package.
+ *
+ * @copyright 2018 Jordan Brauer <18744334+jordanbrauer@users.noreply.github.com>
+ * @license MIT
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace UnitConverter\Calculator\Formula\FuelEconomy\KilometrePerLitre;
+
+use UnitConverter\Calculator\Formula\AbstractFormula;
+
+/**
+ * Formula to convert Kilometre Per Litre values to Miles Per Gallon.
+ *
+ * @version 1.0.0
+ * @author Maksim Martianov <7222812+maksimru@users.noreply.github.com>
+ */
+class ToMilesPerGallonImperial extends AbstractFormula
+{
+
+    const MAGIC_NUMBER = 2.82481;
+
+    const FORMULA_STRING = 'mpg(Imperial) = 2.82481 * km/l';
+
+    const FORMULA_TEMPLATE = '%s mpg(Imperial) = 2.82481 * %skm/l';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function describe($value, $fromUnits, $toUnits, int $precision = null)
+    {
+        // XXX: this formula assumes all calculators can accept strings, as it's the safest type.
+        $addResult = $this->calculator->mul(self::MAGIC_NUMBER, $value);
+        $result = $this->calculator->round($addResult, $precision);
+
+        $this->plugVariables($result, $value);
+
+        return $result;
+    }
+}

src/UnitConverter/Calculator/Formula/FuelEconomy/KilometrePerLitre/ToMilesPerGallon.php → src/UnitConverter/Calculator/Formula/FuelEconomy/KilometrePerLitre/ToMilesPerGallonUS.php

@@ -22,14 +22,14 @@
  * @version 1.0.0
  * @author Maksim Martianov <7222812+maksimru@users.noreply.github.com>
  */
-class ToMilesPerGallon extends AbstractFormula
+class ToMilesPerGallonUS extends AbstractFormula
 {
 
     const MAGIC_NUMBER = 2.35215;
 
-    const FORMULA_STRING = 'mpg = 2.35215 * km/l';
+    const FORMULA_STRING = 'mpg(US) = 2.35215 * km/l';
 
-    const FORMULA_TEMPLATE = '%s mpg = 2.35215 * %skm/l';
+    const FORMULA_TEMPLATE = '%s mpg(US) = 2.35215 * %skm/l';
 
     /**
      * {@inheritDoc}

src/UnitConverter/Calculator/Formula/FuelEconomy/LitrePer100Kilometres/ToKilometrePerLitre.php

@@ -24,6 +24,8 @@
  */
 class ToKilometrePerLitre extends AbstractFormula
 {
+    const MAGIC_NUMBER = 100;
+
     const FORMULA_STRING = 'km/l = 100 / L/100km';
 
     const FORMULA_TEMPLATE = '%s km/l = 100 / %sL/100km';
@@ -34,7 +36,7 @@ class ToKilometrePerLitre extends AbstractFormula
     public function describe($value, $fromUnits, $toUnits, int $precision = null)
     {
         // XXX: this formula assumes all calculators can accept strings, as it's the safest type.
-        $addResult = $this->calculator->div(100, $value);
+        $addResult = $this->calculator->div(self::MAGIC_NUMBER, $value);
         $result = $this->calculator->round($addResult, $precision);
 
         $this->plugVariables($result, $value);

src/UnitConverter/Calculator/Formula/FuelEconomy/LitrePer100Kilometres/ToMilesPerGallonImperial.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types = 1);
+
+/**
+ * This file is part of the jordanbrauer/unit-converter PHP package.
+ *
+ * @copyright 2018 Jordan Brauer <18744334+jordanbrauer@users.noreply.github.com>
+ * @license MIT
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace UnitConverter\Calculator\Formula\FuelEconomy\LitrePer100Kilometres;
+
+use UnitConverter\Calculator\Formula\AbstractFormula;
+
+/**
+ * Formula to convert Miles Per Gallon Per 100 Kilometres values to Miles Per Gallon.
+ *
+ * @version 1.0.0
+ * @author Maksim Martianov <7222812+maksimru@users.noreply.github.com>
+ */
+class ToMilesPerGallonImperial extends AbstractFormula
+{
+
+    const MAGIC_NUMBER = 282.481;
+
+    const FORMULA_STRING = 'mpg(Imperial) = 282.481 / L/100km';
+
+    const FORMULA_TEMPLATE = '%s mpg(Imperial) = 282.481 / %sL/100km';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function describe($value, $fromUnits, $toUnits, int $precision = null)
+    {
+        // XXX: this formula assumes all calculators can accept strings, as it's the safest type.
+        $addResult = $this->calculator->div(self::MAGIC_NUMBER, $value);
+        $result = $this->calculator->round($addResult, $precision);
+
+        $this->plugVariables($result, $value);
+
+        return $result;
+    }
+}

src/UnitConverter/Calculator/Formula/FuelEconomy/LitrePer100Kilometres/ToMilesPerGallon.php → src/UnitConverter/Calculator/Formula/FuelEconomy/LitrePer100Kilometres/ToMilesPerGallonUS.php

@@ -22,14 +22,14 @@
  * @version 1.0.0
  * @author Maksim Martianov <7222812+maksimru@users.noreply.github.com>
  */
-class ToMilesPerGallon extends AbstractFormula
+class ToMilesPerGallonUS extends AbstractFormula
 {
 
     const MAGIC_NUMBER = 235.215;
 
-    const FORMULA_STRING = 'mpg = 235.215 / L/100km';
+    const FORMULA_STRING = 'mpg(US) = 235.215 / L/100km';
 
-    const FORMULA_TEMPLATE = '%s mpg = 235.215 / %sL/100km';
+    const FORMULA_TEMPLATE = '%s mpg(US) = 235.215 / %sL/100km';
 
     /**
      * {@inheritDoc}

src/UnitConverter/Calculator/Formula/FuelEconomy/MilesPerGallonImperial/ToKilometrePerLitre.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types = 1);
+
+/**
+ * This file is part of the jordanbrauer/unit-converter PHP package.
+ *
+ * @copyright 2018 Jordan Brauer <18744334+jordanbrauer@users.noreply.github.com>
+ * @license MIT
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace UnitConverter\Calculator\Formula\FuelEconomy\MilesPerGallonImperial;
+
+use UnitConverter\Calculator\Formula\AbstractFormula;
+
+/**
+ * Formula to convert Miles Per Gallon values to Kilometre Per Litre.
+ *
+ * @version 1.0.0
+ * @author Maksim Martianov <7222812+maksimru@users.noreply.github.com>
+ */
+class ToKilometrePerLitre extends AbstractFormula
+{
+
+    const MAGIC_NUMBER = 0.354006;
+
+    const FORMULA_STRING = 'km/l = 0.354006 * mpg(imp)';
+
+    const FORMULA_TEMPLATE = '%s km/l = 0.354006 * %smpg(imp)';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function describe($value, $fromUnits, $toUnits, int $precision = null)
+    {
+        // XXX: this formula assumes all calculators can accept strings, as it's the safest type.
+        $addResult = $this->calculator->mul(self::MAGIC_NUMBER, $value);
+        $result = $this->calculator->round($addResult, $precision);
+
+        $this->plugVariables($result, $value);
+
+        return $result;
+    }
+}

src/UnitConverter/Calculator/Formula/FuelEconomy/MilesPerGallonImperial/ToLitrePer100Kilometres.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types = 1);
+
+/**
+ * This file is part of the jordanbrauer/unit-converter PHP package.
+ *
+ * @copyright 2018 Jordan Brauer <18744334+jordanbrauer@users.noreply.github.com>
+ * @license MIT
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace UnitConverter\Calculator\Formula\FuelEconomy\MilesPerGallonImperial;
+
+use UnitConverter\Calculator\Formula\AbstractFormula;
+
+/**
+ * Formula to convert Miles Per Gallon values to Litre Per 100 Kilometres.
+ *
+ * @version 1.0.0
+ * @author Maksim Martianov <7222812+maksimru@users.noreply.github.com>
+ */
+class ToLitrePer100Kilometres extends AbstractFormula
+{
+
+    const MAGIC_NUMBER = 282.481;
+
+    const FORMULA_STRING = 'L/100km = 282.481 / mpg(imp)';
+
+    const FORMULA_TEMPLATE = '%s L/100km = 282.481 / %smpg(imp)';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function describe($value, $fromUnits, $toUnits, int $precision = null)
+    {
+        // XXX: this formula assumes all calculators can accept strings, as it's the safest type.
+        $addResult = $this->calculator->div(self::MAGIC_NUMBER, $value);
+        $result = $this->calculator->round($addResult, $precision);
+
+        $this->plugVariables($result, $value);
+
+        return $result;
+    }
+}

src/UnitConverter/Calculator/Formula/FuelEconomy/MilesPerGallonImperial/ToMilesPerGallonUS.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types = 1);
+
+/**
+ * This file is part of the jordanbrauer/unit-converter PHP package.
+ *
+ * @copyright 2018 Jordan Brauer <18744334+jordanbrauer@users.noreply.github.com>
+ * @license MIT
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace UnitConverter\Calculator\Formula\FuelEconomy\MilesPerGallonImperial;
+
+use UnitConverter\Calculator\Formula\AbstractFormula;
+
+/**
+ * Formula to convert Kilometre Per Litre values to Miles Per Gallon.
+ *
+ * @version 1.0.0
+ * @author Maksim Martianov <7222812+maksimru@users.noreply.github.com>
+ */
+class ToMilesPerGallonUS extends AbstractFormula
+{
+
+    const MAGIC_NUMBER = 0.832674;
+
+    const FORMULA_STRING = 'mpg(Imperial) = 0.832674 * mpg(US)';
+
+    const FORMULA_TEMPLATE = '%s mpg(Imperial) = 0.832674 * %smpg(US)';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function describe($value, $fromUnits, $toUnits, int $precision = null)
+    {
+        // XXX: this formula assumes all calculators can accept strings, as it's the safest type.
+        $addResult = $this->calculator->mul(self::MAGIC_NUMBER, $value);
+        $result = $this->calculator->round($addResult, $precision);
+
+        $this->plugVariables($result, $value);
+
+        return $result;
+    }
+}

src/UnitConverter/Calculator/Formula/FuelEconomy/MilesPerGallon/ToKilometrePerLitre.php → src/UnitConverter/Calculator/Formula/FuelEconomy/MilesPerGallonUS/ToKilometrePerLitre.php

@@ -12,7 +12,7 @@
  * file that was distributed with this source code.
  */
 
-namespace UnitConverter\Calculator\Formula\FuelEconomy\MilesPerGallon;
+namespace UnitConverter\Calculator\Formula\FuelEconomy\MilesPerGallonUS;
 
 use UnitConverter\Calculator\Formula\AbstractFormula;
 
@@ -27,9 +27,9 @@ class ToKilometrePerLitre extends AbstractFormula
 
     const MAGIC_NUMBER = 0.425144;
 
-    const FORMULA_STRING = 'km/l = 0.425144 * mpg';
+    const FORMULA_STRING = 'km/l = 0.425144 * mpg(US)';
 
-    const FORMULA_TEMPLATE = '%s km/l = 0.425144 * %smpg';
+    const FORMULA_TEMPLATE = '%s km/l = 0.425144 * %smpg(US)';
 
     /**
      * {@inheritDoc}

src/UnitConverter/Calculator/Formula/FuelEconomy/MilesPerGallon/ToLitrePer100Kilometres.php → src/UnitConverter/Calculator/Formula/FuelEconomy/MilesPerGallonUS/ToLitrePer100Kilometres.php

@@ -12,7 +12,7 @@
  * file that was distributed with this source code.
  */
 
-namespace UnitConverter\Calculator\Formula\FuelEconomy\MilesPerGallon;
+namespace UnitConverter\Calculator\Formula\FuelEconomy\MilesPerGallonUS;
 
 use UnitConverter\Calculator\Formula\AbstractFormula;
 
@@ -24,17 +24,20 @@
  */
 class ToLitrePer100Kilometres extends AbstractFormula
 {
-    const FORMULA_STRING = 'L/100km = 235.215 / mpg';
 
-    const FORMULA_TEMPLATE = '%s L/100km = 235.215 / %smpg';
+    const MAGIC_NUMBER = 235.215;
+
+    const FORMULA_STRING = 'L/100km = 235.215 / mpg(US)';
+
+    const FORMULA_TEMPLATE = '%s L/100km = 235.215 / %smpg(US)';
 
     /**
      * {@inheritDoc}
      */
     public function describe($value, $fromUnits, $toUnits, int $precision = null)
     {
         // XXX: this formula assumes all calculators can accept strings, as it's the safest type.
-        $addResult = $this->calculator->div(235.215, $value);
+        $addResult = $this->calculator->div(self::MAGIC_NUMBER, $value);
         $result = $this->calculator->round($addResult, $precision);
 
         $this->plugVariables($result, $value);