JordanRL / Fermat

src/Samsara/Fermat/Values/ImmutableDecimal.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      * @throws IntegrityConstraint

      * @throws MissingPackage

      */

-    public function continuousModulo(NumberInterface|string|int|float $mod): DecimalInterface

+    public function continuousModulo(NumberInterface | string | int | float $mod): DecimalInterface

     {

 

         $mod = Numbers::makeOrDont(Numbers::IMMUTABLE, $mod);

src/Samsara/Fermat/Provider/ConstantProvider.php

Spacing +3 added lines, -3 removed lines

@@ -37,14 +37,14 @@ 
             return self::$pi->truncateToScale($digits)->getValue(NumberBase::Ten);
         }
 
-        $internalScale = ($digits*2) + 10;
+        $internalScale = ($digits*2)+10;
 
         $C = Numbers::make(Numbers::IMMUTABLE, '10005', $internalScale)->setMode(CalcMode::Precision)->sqrt($internalScale)->multiply(426880);
         $M = Numbers::make(Numbers::IMMUTABLE, '1', $internalScale)->setMode(CalcMode::Precision);
         $L = Numbers::make(Numbers::IMMUTABLE, '13591409', $internalScale)->setMode(CalcMode::Precision);
         $K = Numbers::make(Numbers::IMMUTABLE, '6', $internalScale)->setMode(CalcMode::Precision);
         $X = Numbers::make(Numbers::IMMUTABLE, '1')->setMode(CalcMode::Precision);
-        $sum = Numbers::make(Numbers::MUTABLE,'0', $internalScale + 2)->setMode(CalcMode::Precision);
+        $sum = Numbers::make(Numbers::MUTABLE, '0', $internalScale+2)->setMode(CalcMode::Precision);
         $termNum = 0;
         $one = Numbers::makeOne($internalScale)->setMode(CalcMode::Precision);
 
@@ -96,7 +96,7 @@ 
             return self::$e->truncateToScale($digits)->getValue(NumberBase::Ten);
         }
 
-        $internalScale = $digits + 3;
+        $internalScale = $digits+3;
 
         $one = Numbers::makeOne($internalScale+5)->setMode(CalcMode::Precision);
         $denominator = Numbers::make(Numbers::MUTABLE, '1', $internalScale)->setMode(CalcMode::Precision);

src/Samsara/Fermat/Numbers.php

Spacing +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
      * @return ImmutableDecimal|MutableDecimal|NumberInterface|ImmutableDecimal[]|MutableDecimal[]|NumberInterface[]

      * @throws IntegrityConstraint

      */

-    public static function makeOrDont(string|object $type, mixed $value, ?int $scale = null, NumberBase $base = NumberBase::Ten)

+    public static function makeOrDont(string | object $type, mixed $value, ?int $scale = null, NumberBase $base = NumberBase::Ten)

     {

 

         if (is_object($value)) {

@@ -236,7 +236,7 @@ 
             }

 

             if ($scale > 100) {

-                $pi = self::make(self::IMMUTABLE, ConstantProvider::makePi($scale+2), $scale + 2);

+                $pi = self::make(self::IMMUTABLE, ConstantProvider::makePi($scale+2), $scale+2);

                 /** @var ImmutableDecimal */

                 return $pi->multiply(2)->truncateToScale($scale);

             }

src/Samsara/Fermat/Types/Traits/Decimal/LogScaleTrait.php

Spacing +6 added lines, -6 removed lines

@@ -48,14 +48,14 @@ 
             $e = Numbers::makeE($scale+$addScale);
             $value = $e->pow($this);
         } else {
-            $intScale = ($this->numberOfIntDigits()) ? ($scale + 2) * $this->numberOfIntDigits() : ($scale + 2);
-            $intScale = ($this->numberOfLeadingZeros()) ? $intScale * $this->numberOfLeadingZeros() : $intScale;
+            $intScale = ($this->numberOfIntDigits()) ? ($scale+2)*$this->numberOfIntDigits() : ($scale+2);
+            $intScale = ($this->numberOfLeadingZeros()) ? $intScale*$this->numberOfLeadingZeros() : $intScale;
             $x = $this instanceof ImmutableDecimal ? $this : new ImmutableDecimal($this->getValue(NumberBase::Ten), $intScale);
             $x2 = $x->pow(2);
             $terms = $scale;
             $six = new ImmutableDecimal(6, $intScale);
 
-            $aPart = new class($x2, $x) implements ContinuedFractionTermInterface{
+            $aPart = new class($x2, $x) implements ContinuedFractionTermInterface {
                 private ImmutableDecimal $x2;
                 private ImmutableDecimal $x;
 
@@ -83,7 +83,7 @@ 
                 }
             };
 
-            $bPart = new class($x, $six, $intScale) implements ContinuedFractionTermInterface{
+            $bPart = new class($x, $six, $intScale) implements ContinuedFractionTermInterface {
                 private ImmutableDecimal $x;
                 private ImmutableDecimal $six;
                 private int $intScale;
@@ -133,7 +133,7 @@ 
     protected function lnScale(int $scale = null): string
     {
         $internalScale = $scale ?? $this->getScale();
-        $internalScale += 3 + $this->numberOfLeadingZeros();
+        $internalScale += 3+$this->numberOfLeadingZeros();
 
         if (extension_loaded('decimal')) {
             $decimalScale = max($internalScale*2, $this->numberOfTotalDigits()*2);
@@ -193,7 +193,7 @@ 
         $answer = $adjustedNum;
 
         if ($exp2) {
-            $answer = $answer->add(Numbers::makeNaturalLog2($internalScale + abs($exp2))->multiply($exp2));
+            $answer = $answer->add(Numbers::makeNaturalLog2($internalScale+abs($exp2))->multiply($exp2));
         }
 
         if ($exp1p1) {

src/Samsara/Fermat/Types/Traits/Trigonometry/TrigonometryScaleTrait.php

Spacing +14 added lines, -14 removed lines

@@ -38,8 +38,8 @@ 
 
         $thisNum = Numbers::make(Numbers::IMMUTABLE, $this->getValue(NumberBase::Ten), $modScale);
 
-        $twoPi = Numbers::make2Pi($modScale + 2);
-        $pi = Numbers::makePi( $scale + 2 );
+        $twoPi = Numbers::make2Pi($modScale+2);
+        $pi = Numbers::makePi($scale+2);
 
         if ($pi->truncate($scale)->isEqual($thisNum->truncate($scale)) || $twoPi->truncate($scale)->isEqual($thisNum->truncate($scale))) {
             return '0';
@@ -51,14 +51,14 @@ 
 
         $answer = SeriesProvider::maclaurinSeries(
             $modulo,
-            function ($n) use ($scale, $negOne, $one) {
+            function($n) use ($scale, $negOne, $one) {
 
-                return $n % 2 ? $negOne : $one;
+                return $n%2 ? $negOne : $one;
             },
-            function ($n) {
+            function($n) {
                 return SequenceProvider::nthOddNumber($n);
             },
-            function ($n) {
+            function($n) {
                 return SequenceProvider::nthOddNumber($n)->factorial();
             },
             0,
@@ -88,8 +88,8 @@ 
 
         $thisNum = Numbers::make(Numbers::IMMUTABLE, $this->getValue(NumberBase::Ten), $modScale);
 
-        $twoPi = Numbers::make2Pi($modScale + 2);
-        $pi = Numbers::makePi( $modScale + 2);
+        $twoPi = Numbers::make2Pi($modScale+2);
+        $pi = Numbers::makePi($modScale+2);
         $piDivTwo = $pi->divide(2);
 
         if ($twoPi->truncate($scale)->isEqual($thisNum->truncate($scale))) {
@@ -113,14 +113,14 @@ 
 
         $answer = SeriesProvider::maclaurinSeries(
             $modulo,
-            function ($n) use ($negOne, $one) {
+            function($n) use ($negOne, $one) {
 
-                return $n % 2 ? $negOne : $one;
+                return $n%2 ? $negOne : $one;
             },
-            function ($n) use ($intScale) {
+            function($n) use ($intScale) {
                 return SequenceProvider::nthEvenNumber($n, $intScale);
             },
-            function ($n) use ($intScale) {
+            function($n) use ($intScale) {
                 return SequenceProvider::nthEvenNumber($n, $intScale)->factorial();
             },
             0,
@@ -139,7 +139,7 @@ 
     protected function tanScale(int $scale = null): string
     {
         $scale = $scale ?? $this->getScale();
-        $intScale = $scale + 4;
+        $intScale = $scale+4;
         $intScale = $intScale+$this->numberOfIntDigits()+$this->numberOfLeadingZeros();
 
         $thisNum = Numbers::make(Numbers::IMMUTABLE, $this->getValue(NumberBase::Ten), $intScale);
@@ -286,7 +286,7 @@ 
 
         if ($mod2Pi->isEqual(0)) {
             return static::INFINITY;
-        } elseif($modPi->isEqual(0)) {
+        } elseif ($modPi->isEqual(0)) {
             return static::NEG_INFINITY;
         }
 

src/Samsara/Fermat/Types/Traits/Decimal/ScaleTrait.php

Spacing +2 added lines, -2 removed lines

@@ -147,7 +147,7 @@ 
         $total = strlen($fractional);
         $fractional = ltrim($fractional, '0');
 
-        return ($total - strlen($fractional));
+        return ($total-strlen($fractional));
     }
 
     /**
@@ -157,7 +157,7 @@ 
      */
     public function numberOfTotalDigits(): int
     {
-        return $this->numberOfDecimalDigits() + $this->numberOfIntDigits();
+        return $this->numberOfDecimalDigits()+$this->numberOfIntDigits();
     }
 
     /**

src/Samsara/Fermat/Types/Traits/Arithmetic/ArithmeticNativeTrait.php

Spacing +11 added lines, -11 removed lines

@@ -15,7 +15,7 @@ 
      * @param DecimalInterface $num
      * @return int|float
      */
-    protected static function translateToNative(DecimalInterface $num): int|float
+    protected static function translateToNative(DecimalInterface $num): int | float
     {
         return ($num->isInt() ? $num->asInt() : $num->asFloat());
     }
@@ -24,12 +24,12 @@ 
      * @param DecimalInterface $num
      * @return int|float
      */
-    protected function addNative(DecimalInterface $num): int|float
+    protected function addNative(DecimalInterface $num): int | float
     {
         $left = self::translateToNative($this);
         $right = self::translateToNative($num);
 
-        $value = $left + $right;
+        $value = $left+$right;
         return (string)$value;
     }
 
@@ -37,12 +37,12 @@ 
      * @param DecimalInterface $num
      * @return int|float
      */
-    protected function subtractNative(DecimalInterface $num): int|float
+    protected function subtractNative(DecimalInterface $num): int | float
     {
         $left = self::translateToNative($this);
         $right = self::translateToNative($num);
 
-        $value = $left - $right;
+        $value = $left-$right;
         return (string)$value;
     }
 
@@ -50,12 +50,12 @@ 
      * @param DecimalInterface $num
      * @return int|float
      */
-    protected function multiplyNative(DecimalInterface $num): int|float
+    protected function multiplyNative(DecimalInterface $num): int | float
     {
         $left = self::translateToNative($this);
         $right = self::translateToNative($num);
 
-        $value = $left * $right;
+        $value = $left*$right;
         return (string)$value;
     }
 
@@ -63,12 +63,12 @@ 
      * @param DecimalInterface $num
      * @return int|float
      */
-    protected function divideNative(DecimalInterface $num): int|float
+    protected function divideNative(DecimalInterface $num): int | float
     {
         $left = self::translateToNative($this);
         $right = self::translateToNative($num);
 
-        $value = $left / $right;
+        $value = $left/$right;
         return (string)$value;
     }
 
@@ -76,7 +76,7 @@ 
      * @param DecimalInterface $num
      * @return int|float
      */
-    protected function powNative(DecimalInterface $num): int|float
+    protected function powNative(DecimalInterface $num): int | float
     {
         $left = self::translateToNative($this);
         $right = self::translateToNative($num);
@@ -88,7 +88,7 @@ 
     /**
      * @return int|float
      */
-    protected function sqrtNative(): int|float
+    protected function sqrtNative(): int | float
     {
         $value = sqrt($this->asFloat());
         return (string)$value;

src/Samsara/Fermat/Types/Decimal.php

Spacing +8 added lines, -8 removed lines

@@ -106,14 +106,14 @@ 
                 if ($exp > 0) {
                     $exp -= strlen($right);
                     if ($exp >= 0) {
-                        $right = str_pad($right, $exp - 1, '0').'.0';
+                        $right = str_pad($right, $exp-1, '0').'.0';
                     } else {
-                        $right = substr($right, 0, strlen($right) + abs($exp)).'.'.substr($right, strlen($right) + abs($exp) + 1);
+                        $right = substr($right, 0, strlen($right)+abs($exp)).'.'.substr($right, strlen($right)+abs($exp)+1);
                     }
                 } else {
                     $exp += strlen($left);
                     if ($exp >= 0) {
-                        $left = substr($left, 0, $exp).'.'.substr($left, $exp + 1);
+                        $left = substr($left, 0, $exp).'.'.substr($left, $exp+1);
                     } else {
                         $left = '0.'.str_pad($left, abs($exp)+1, '0', STR_PAD_LEFT);
                     }
@@ -258,7 +258,7 @@ 
      * @param NumberBase $base
      * @return DecimalInterface|NumberInterface
      */
-    public function setBase(NumberBase $base): DecimalInterface|NumberInterface
+    public function setBase(NumberBase $base): DecimalInterface | NumberInterface
     {
         $this->base = $base;
 
@@ -270,7 +270,7 @@ 
      *
      * @return DecimalInterface|NumberInterface
      */
-    public function abs(): DecimalInterface|NumberInterface
+    public function abs(): DecimalInterface | NumberInterface
     {
         $newValue = $this->absValue();
 
@@ -281,7 +281,7 @@ 
      * @param DecimalInterface $num
      * @return float|int
      */
-    protected static function translateToNative(DecimalInterface $num): float|int
+    protected static function translateToNative(DecimalInterface $num): float | int
     {
         return ($num->isInt() ? $num->asInt() : $num->asFloat());
     }
@@ -334,13 +334,13 @@ 
      * @param bool $setToNewBase
      * @return DecimalInterface
      */
-    abstract protected function setValue(string $value, ?int $scale = null, ?NumberBase $base = null, bool $setToNewBase = false): DecimalInterface; // TODO: Check usages for base correctness & preservation
+    abstract protected function setValue(string $value, ?int $scale = null, ?NumberBase $base = null, bool $setToNewBase = false): DecimalInterface;// TODO: Check usages for base correctness & preservation
 
     /**
      * @param NumberInterface|string|int|float $mod
      * @return DecimalInterface
      */
-    abstract public function continuousModulo(NumberInterface|string|int|float $mod): DecimalInterface;
+    abstract public function continuousModulo(NumberInterface | string | int | float $mod): DecimalInterface;
 
     /**
      * @param string $decimalPart

src/Samsara/Fermat/Provider/SequenceProvider.php

Spacing +56 added lines, -56 removed lines

@@ -20,57 +20,57 @@ 
 {
 
     const EULER_ZIGZAG = [
-        '1',                                                        // 0
-        '1',                                                        // 1
-        '1',                                                        // 2
-        '2',                                                        // 3
-        '5',                                                        // 4
-        '16',                                                       // 5
-        '61',                                                       // 6
-        '272',                                                      // 7
-        '1385',                                                     // 8
-        '7936',                                                     // 9
-        '50521',                                                    // 10
-        '353792',                                                   // 11
-        '2702765',                                                  // 12
-        '22368256',                                                 // 13
-        '199360981',                                                // 14
-        '1903757312',                                               // 15
-        '19391512145',                                              // 16
-        '209865342976',                                             // 17
-        '2404879675441',                                            // 18
-        '29088885112832',                                           // 19
-        '370371188237525',                                          // 20
-        '4951498053124096',                                         // 21
-        '69348874393137901',                                        // 22
-        '1015423886506852352',                                      // 23
-        '15514534163557086905',                                     // 24
-        '246921480190207983616',                                    // 25
-        '4087072509293123892361',                                   // 26
-        '70251601603943959887872',                                  // 27
-        '1252259641403629865468285',                                // 28
-        '23119184187809597841473536',                               // 29
-        '441543893249023104553682821',                              // 30
-        '8713962757125169296170811392',                             // 31
-        '177519391579539289436664789665',                           // 32
-        '3729407703720529571097509625856',                          // 33
-        '80723299235887898062168247453281',                         // 34
-        '1798651693450888780071750349094912',                       // 35
-        '41222060339517702122347079671259045',                      // 36
-        '970982810785059112379399707952152576',                     // 37
-        '23489580527043108252017828576198947741',                   // 38
-        '583203324917310043943191641625494290432',                  // 39
-        '14851150718114980017877156781405826684425',                // 40
-        '387635983772083031828014624002175135645696',               // 41
-        '10364622733519612119397957304745185976310201',             // 42
-        '283727921907431909304183316295787837183229952',            // 43
-        '7947579422597592703608040510088070619519273805',           // 44
-        '227681379129930886488600284336316164603920777216',         // 45
-        '6667537516685544977435028474773748197524107684661',        // 46
-        '199500252157859031027160499643195658166340757225472',      // 47
-        '6096278645568542158691685742876843153976539044435185',     // 48
-        '190169564657928428175235445073924928592047775873499136',   // 49
-        '6053285248188621896314383785111649088103498225146815121',  // 50
+        '1', // 0
+        '1', // 1
+        '1', // 2
+        '2', // 3
+        '5', // 4
+        '16', // 5
+        '61', // 6
+        '272', // 7
+        '1385', // 8
+        '7936', // 9
+        '50521', // 10
+        '353792', // 11
+        '2702765', // 12
+        '22368256', // 13
+        '199360981', // 14
+        '1903757312', // 15
+        '19391512145', // 16
+        '209865342976', // 17
+        '2404879675441', // 18
+        '29088885112832', // 19
+        '370371188237525', // 20
+        '4951498053124096', // 21
+        '69348874393137901', // 22
+        '1015423886506852352', // 23
+        '15514534163557086905', // 24
+        '246921480190207983616', // 25
+        '4087072509293123892361', // 26
+        '70251601603943959887872', // 27
+        '1252259641403629865468285', // 28
+        '23119184187809597841473536', // 29
+        '441543893249023104553682821', // 30
+        '8713962757125169296170811392', // 31
+        '177519391579539289436664789665', // 32
+        '3729407703720529571097509625856', // 33
+        '80723299235887898062168247453281', // 34
+        '1798651693450888780071750349094912', // 35
+        '41222060339517702122347079671259045', // 36
+        '970982810785059112379399707952152576', // 37
+        '23489580527043108252017828576198947741', // 38
+        '583203324917310043943191641625494290432', // 39
+        '14851150718114980017877156781405826684425', // 40
+        '387635983772083031828014624002175135645696', // 41
+        '10364622733519612119397957304745185976310201', // 42
+        '283727921907431909304183316295787837183229952', // 43
+        '7947579422597592703608040510088070619519273805', // 44
+        '227681379129930886488600284336316164603920777216', // 45
+        '6667537516685544977435028474773748197524107684661', // 46
+        '199500252157859031027160499643195658166340757225472', // 47
+        '6096278645568542158691685742876843153976539044435185', // 48
+        '190169564657928428175235445073924928592047775873499136', // 49
+        '6053285248188621896314383785111649088103498225146815121', // 50
     ];
 
     /**
@@ -89,7 +89,7 @@ 
             $sequence = new NumberCollection();
 
             for ($i = 0;$i < $collectionSize;$i++) {
-                $sequence->push(self::nthOddNumber($n + $i));
+                $sequence->push(self::nthOddNumber($n+$i));
             }
 
             return $sequence;
@@ -122,7 +122,7 @@ 
             $sequence = new NumberCollection();
 
             for ($i = 0;$i < $collectionSize;$i++) {
-                $sequence->push(self::nthEvenNumber($n + $i));
+                $sequence->push(self::nthEvenNumber($n+$i));
             }
 
             return $sequence;
@@ -154,13 +154,13 @@ 
             $sequence = new NumberCollection();
 
             for ($i = 0;$i < $collectionSize;$i++) {
-                $sequence->push(self::nthPowerNegativeOne($n + $i));
+                $sequence->push(self::nthPowerNegativeOne($n+$i));
             }
 
             return $sequence;
         }
 
-        return ($n % 2 ? new ImmutableDecimal(-1) : new ImmutableDecimal(1));
+        return ($n%2 ? new ImmutableDecimal(-1) : new ImmutableDecimal(1));
 
     }
 
@@ -181,7 +181,7 @@ 
             $sequence = new NumberCollection();
 
             for ($i = 0;$i < $collectionSize;$i++) {
-                $sequence->push(self::nthEulerZigzag($n + $i));
+                $sequence->push(self::nthEulerZigzag($n+$i));
             }
 
             return $sequence;