@@ -4,7 +4,7 @@ |
||
| 4 | 4 | <?php if (count($v) === 2): // Isolated date.?> |
| 5 | 5 | <div class='bar bar-date bar<?= $k ?>' style='left:<?= $v[0] . ((int)$v[0] !== 0 ? '%' : '') ?>;' |
| 6 | 6 | data-title='<?= $v[1] ?>'></div> |
| 7 | - <?php else: ?> |
|
| 7 | + <?php else : ?> |
|
| 8 | 8 | <div class='bar bar-intv bar<?= $k ?> <?= $v[2] ?> <?= strpos($v[5], '*') ? 'striped' : '' ?>' |
| 9 | 9 | style='left:<?= $v[0] . ((int)$v[0] !== 0 ? '%' : '') ?>;right:<?= $v[1] . ((int)$v[1] !== 0 ? '%' : '') ?>' |
| 10 | 10 | data-title="<?= $v[3] . ' ➔ ' . $v[4] . (isset($v[5]) ? ' : ' . $v[5] : '') ?>"> |
@@ -4,11 +4,14 @@ |
||
| 4 | 4 | <?php if (count($v) === 2): // Isolated date.?> |
| 5 | 5 | <div class='bar bar-date bar<?= $k ?>' style='left:<?= $v[0] . ((int)$v[0] !== 0 ? '%' : '') ?>;' |
| 6 | 6 | data-title='<?= $v[1] ?>'></div> |
| 7 | - <?php else: ?> |
|
| 7 | + <?php else { |
|
| 8 | + : ?> |
|
| 8 | 9 | <div class='bar bar-intv bar<?= $k ?> <?= $v[2] ?> <?= strpos($v[5], '*') ? 'striped' : '' ?>' |
| 9 | 10 | style='left:<?= $v[0] . ((int)$v[0] !== 0 ? '%' : '') ?>;right:<?= $v[1] . ((int)$v[1] !== 0 ? '%' : '') ?>' |
| 10 | 11 | data-title="<?= $v[3] . ' ➔ ' . $v[4] . (isset($v[5]) ? ' : ' . $v[5] : '') ?>"> |
| 11 | 12 | </div> |
| 12 | - <?php endif; ?> |
|
| 13 | + <?php endif; |
|
| 14 | +} |
|
| 15 | +?> |
|
| 13 | 16 | <?php endforeach; ?> |
| 14 | 17 | </div> |
| 15 | 18 | \ No newline at end of file |
@@ -42,10 +42,10 @@ |
||
| 42 | 42 | { |
| 43 | 43 | $intvg = new IntervalGraph(); |
| 44 | 44 | $intvg->getFlattener() |
| 45 | - ->setSubstractStep(static function (DateTime $bound) { |
|
| 45 | + ->setSubstractStep(static function(DateTime $bound) { |
|
| 46 | 46 | return (clone $bound)->sub(new DateInterval('PT1S')); |
| 47 | 47 | }) |
| 48 | - ->setAddStep(static function (DateTime $bound) { |
|
| 48 | + ->setAddStep(static function(DateTime $bound) { |
|
| 49 | 49 | return (clone $bound)->add(new DateInterval('PT1S')); |
| 50 | 50 | }); |
| 51 | 51 | if (isset($intervals)) { |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | D::intv(6, 9, 2 / 10), |
| 40 | 40 | ]; |
| 41 | 41 | |
| 42 | -$longDateFormat = static function (DateTime $bound) { |
|
| 42 | +$longDateFormat = static function(DateTime $bound) { |
|
| 43 | 43 | return $bound->format('Y-m-d H:i:s'); |
| 44 | 44 | }; |
| 45 | 45 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | |
| 52 | 52 | // An aggregate function for arrays representing fractions with the same denominator. |
| 53 | -$agg = static function ($a, $b) { |
|
| 53 | +$agg = static function($a, $b) { |
|
| 54 | 54 | if ($a === null && $b === null) { |
| 55 | 55 | return null; |
| 56 | 56 | } |
@@ -58,12 +58,12 @@ discard block |
||
| 58 | 58 | }; |
| 59 | 59 | |
| 60 | 60 | // A toNumeric function… |
| 61 | -$toNumeric = static function ($a) { |
|
| 61 | +$toNumeric = static function($a) { |
|
| 62 | 62 | return $a === null ? null : (int)($a[0] / $a[1] * 100); |
| 63 | 63 | }; |
| 64 | 64 | |
| 65 | 65 | // A toString function… |
| 66 | -$toString = static function ($a) { |
|
| 66 | +$toString = static function($a) { |
|
| 67 | 67 | return $a === null ? null : ($a[0] . '/' . $a[1]); |
| 68 | 68 | }; |
| 69 | 69 | |
@@ -86,8 +86,8 @@ discard block |
||
| 86 | 86 | /* |
| 87 | 87 | * TRUNCATED INTERVALS |
| 88 | 88 | */ |
| 89 | -$intv1 = (DateTime::createFromFormat('Y-m-d', '2019-01-01'))->add(new DateInterval('PT60H'))->setTime(0,0); |
|
| 90 | -$intv2 = (DateTime::createFromFormat('Y-m-d', '2019-01-01'))->add(new DateInterval('PT108H'))->setTime(23,59,59); |
|
| 89 | +$intv1 = (DateTime::createFromFormat('Y-m-d', '2019-01-01'))->add(new DateInterval('PT60H'))->setTime(0, 0); |
|
| 90 | +$intv2 = (DateTime::createFromFormat('Y-m-d', '2019-01-01'))->add(new DateInterval('PT108H'))->setTime(23, 59, 59); |
|
| 91 | 91 | $intv3 = (clone $intv2)->add(new DateInterval('PT60H')); |
| 92 | 92 | |
| 93 | 93 | $truncated = ($fractim->setIntervals(Truncator::truncate($fractions, $intv1, $intv2))) |
@@ -189,14 +189,14 @@ discard block |
||
| 189 | 189 | <?php |
| 190 | 190 | |
| 191 | 191 | /* ADDITIONAL INFORMATION */ |
| 192 | -$toString2 = static function ($a) { |
|
| 192 | +$toString2 = static function($a) { |
|
| 193 | 193 | if ($a === null) { |
| 194 | 194 | return null; |
| 195 | 195 | } |
| 196 | 196 | return $a[0] . '/' . $a[1] . ($a[2] ? '*' : ''); |
| 197 | 197 | }; |
| 198 | 198 | |
| 199 | -$agg2 = static function ($a, $b) { |
|
| 199 | +$agg2 = static function($a, $b) { |
|
| 200 | 200 | if ($a === null && $b === null) { |
| 201 | 201 | return null; |
| 202 | 202 | } |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | $bounds[] = [$interval[0], '+', true, $key, $interval[2] ?? null]; |
| 74 | 74 | } |
| 75 | 75 | // Order the bounds. |
| 76 | - usort($bounds, static function (array $d1, array $d2) { |
|
| 76 | + usort($bounds, static function(array $d1, array $d2) { |
|
| 77 | 77 | return ($d1[0] < $d2[0]) ? -1 : 1; |
| 78 | 78 | }); |
| 79 | 79 | return $bounds; |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | |
| 40 | 40 | public function __construct() |
| 41 | 41 | { |
| 42 | - $this->aggregateFunction = static function ($a, $b) { |
|
| 42 | + $this->aggregateFunction = static function($a, $b) { |
|
| 43 | 43 | if ($a === null && $b === null) { |
| 44 | 44 | return null; |
| 45 | 45 | } |
@@ -58,19 +58,19 @@ discard block |
||
| 58 | 58 | $this->setIntervals($intervals); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - $this->boundToNumeric = static function (DateTime $bound) { |
|
| 61 | + $this->boundToNumeric = static function(DateTime $bound) { |
|
| 62 | 62 | return $bound->getTimestamp(); |
| 63 | 63 | }; |
| 64 | 64 | |
| 65 | - $this->boundToString = static function (DateTime $bound) { |
|
| 65 | + $this->boundToString = static function(DateTime $bound) { |
|
| 66 | 66 | return $bound->format('Y-m-d'); |
| 67 | 67 | }; |
| 68 | 68 | |
| 69 | - $this->valueToNumeric = static function ($v) { |
|
| 69 | + $this->valueToNumeric = static function($v) { |
|
| 70 | 70 | return $v === null ? null : (int)($v * 100); |
| 71 | 71 | }; |
| 72 | 72 | |
| 73 | - $this->valueToString = static function ($v) { |
|
| 73 | + $this->valueToString = static function($v) { |
|
| 74 | 74 | return $v === null ? null : ($v * 100 . '%'); |
| 75 | 75 | }; |
| 76 | 76 | |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | // Order by low bound. |
| 236 | - uasort($numVals, static function (array $i1, array $i2) { |
|
| 236 | + uasort($numVals, static function(array $i1, array $i2) { |
|
| 237 | 237 | return ($i1[0] < $i2[0]) ? -1 : 1; |
| 238 | 238 | }); |
| 239 | 239 | |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | // Order by high bound. |
| 252 | - uasort($numVals, static function (array $i1, array $i2) { |
|
| 252 | + uasort($numVals, static function(array $i1, array $i2) { |
|
| 253 | 253 | return ($i1[1] < $i2[1]) ? -1 : 1; |
| 254 | 254 | }); |
| 255 | 255 | |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | !empty($originalValues) ? $this->palette->getColor($colval) : 50, // Interval color |
| 293 | 293 | ($this->boundToString)($lowBound), // Interval start string value |
| 294 | 294 | ($this->boundToString)($highBound), // Interval end string value |
| 295 | - !empty($originalValues) ? $strval : null,// Interval string value |
|
| 295 | + !empty($originalValues) ? $strval : null, // Interval string value |
|
| 296 | 296 | ]; |
| 297 | 297 | } |
| 298 | 298 | } |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | // Put discrete values at the end and reset indices. |
| 301 | 301 | // Reseting indices ensures the processed values are |
| 302 | 302 | // serialized as correctly ordered JSON arrays. |
| 303 | - usort($numVals, static function ($i) { |
|
| 303 | + usort($numVals, static function($i) { |
|
| 304 | 304 | return count($i) === 2 ? 1 : -1; |
| 305 | 305 | }); |
| 306 | 306 | |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | $adjacentIntervals = $this->flattener->calcAdjacentIntervals($this->intervals); |
| 322 | 322 | |
| 323 | 323 | // Remove empty interval generated when two or more intervals share a common bound. |
| 324 | - $adjacentIntervals = array_values(array_filter($adjacentIntervals, static function ($i) { |
|
| 324 | + $adjacentIntervals = array_values(array_filter($adjacentIntervals, static function($i) { |
|
| 325 | 325 | // Use weak comparison in case of object typed bounds. |
| 326 | 326 | return $i[0] != $i[1]; |
| 327 | 327 | })); |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | */ |
| 350 | 350 | public static function extractDiscreteValues(array &$intervals): array |
| 351 | 351 | { |
| 352 | - $discreteValues = array_filter($intervals, static function ($interval) { |
|
| 352 | + $discreteValues = array_filter($intervals, static function($interval) { |
|
| 353 | 353 | return $interval[0] === $interval[1]; |
| 354 | 354 | }); |
| 355 | 355 | |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | // Order by high bound. |
| 382 | - uasort($numericIntervals, static function (array $i1, array $i2) { |
|
| 382 | + uasort($numericIntervals, static function(array $i1, array $i2) { |
|
| 383 | 383 | return ($i1[1] < $i2[1]) ? -1 : 1; |
| 384 | 384 | }); |
| 385 | 385 | |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | // Put discrete values at the end and reset indices. |
| 409 | 409 | // Reseting indices ensures the processed values are |
| 410 | 410 | // serialized as correctly ordered JSON arrays. |
| 411 | - usort($numericIntervals, static function ($i) { |
|
| 411 | + usort($numericIntervals, static function($i) { |
|
| 412 | 412 | return !is_array($i) ? 1 : -1; |
| 413 | 413 | }); |
| 414 | 414 | |