NeonXP/MathExecutor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cache-control improvements (#81)

Browse source 
* cache-control improvements

* Update src/NXP/MathExecutor.php

yeah, you're right.

Co-authored-by: Alexander Kiryukhin <a.kiryukhin@mail.ru>

* Update MathExecutor.php

braces qfix

* Update MathExecutor.php

Co-authored-by: Alexander Kiryukhin <a.kiryukhin@mail.ru>
This commit is contained in:
Mirosław Sztorc 2021-01-06 01:06:04 +01:00 committed by GitHub
parent 5ed72fda6f
commit a4b0fac121
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/NXP/MathExecutor.php
View file

@ -412,22 +412,26 @@ class MathExecutor
/**
* Execute expression
*
* @param $expression
* @param string $expression
* @param bool $cache
* @return number
* @throws Exception\IncorrectExpressionException
* @throws Exception\IncorrectBracketsException
* @throws Exception\IncorrectExpressionException
* @throws Exception\UnknownOperatorException
* @throws Exception\UnknownVariableException
* @throws UnknownVariableException
*/
public function execute(string $expression)
public function execute(string $expression, bool $cache = true)
{
$cachekey = $expression;
if (!array_key_exists($cachekey, $this->cache)) {
$tokens = (new Tokenizer($expression, $this->operators))->tokenize()->buildReversePolishNotation();
$this->cache[$cachekey] = $tokens;
if ($cache) {
$this->cache[$cachekey] = $tokens;
}
} else {
$tokens = $this->cache[$cachekey];
}
$calculator = new Calculator($this->functions, $this->operators);
return $calculator->calculate($tokens, $this->variables, $this->onVarNotFound);
}
@ -596,6 +600,23 @@ class MathExecutor
return $this;
}
/**
* Get cache array with tokens
* @return array
*/
public function getCache() : array
{
return $this->cache;
}
/**
* Clear token's cache
*/
public function clearCache() : void
{
$this->cache = [];
}
public function __clone()
{
$this->addDefaults();

24
tests/MathTest.php
View file

@ -589,4 +589,28 @@ class MathTest extends TestCase
];
}
public function testCache()
{
$calculator = new MathExecutor();
$this->assertEquals(256, $calculator->execute('2 ^ 8')); // second arg $cache is true by default
$this->assertIsArray($calculator->getCache());
$this->assertEquals(1, count($calculator->getCache()));
$this->assertEquals(512, $calculator->execute('2 ^ 9', true));
$this->assertEquals(2, count($calculator->getCache()));
$this->assertEquals(1024, $calculator->execute('2 ^ 10', false));
$this->assertEquals(2, count($calculator->getCache()));
$calculator->clearCache();
$this->assertIsArray($calculator->getCache());
$this->assertEquals(0, count($calculator->getCache()));
$this->assertEquals(2048, $calculator->execute('2 ^ 11', false));
$this->assertEquals(0, count($calculator->getCache()));
}
}