handle myriad algos and graph only current one

This commit is contained in:
Tanguy Pruvot 2015-09-18 21:38:50 +02:00
parent dc0bb5a0d8
commit 9535e02ed8
2 changed files with 11 additions and 7 deletions

View file

@ -31,14 +31,16 @@ if (empty($json)) {
if (!$multiAlgos)
$series['diff'][$n] = array($dt,$diff);
else {
if ($algo == 'sha256') $diff /= 100000.;
if ($algo == 'skein') $diff /= 10.;
//if ($algo == 'sha256') $diff /= 100000.;
//if ($algo == 'skein') $diff /= 10.;
$series[$algo][$n] = array($dt,$diff);
}
}
if (!$multiAlgos)
$json = json_encode(array_values($series['diff']));
else if (!empty($coin->algo) && !empty($series[$coin->algo]))
$json = json_encode(array_values($series[$coin->algo]));
else {
$json = '';
foreach ($series as $algo => $data) {
@ -47,9 +49,8 @@ if (empty($json)) {
}
$json = rtrim($json, ',');
}
// memcache the data
controller()->memcache->set("yiimp-explorer-diff-".$coin->symbol, $json, 120);
}
echo "[$json]";
// memcache the data
controller()->memcache->set("yiimp-explorer-diff-".$coin->symbol, $json, 120);

View file

@ -147,6 +147,9 @@ function remove0x($string)
// version is used for multi algo coins
function versionToAlgo($coin, $version)
{
$algos['MYR'] = array(
0=>'sha256', 1=>'scrypt', 2=>'groestl', 3=>'skein', 4=>'qubit'
);
$algos['DGB'] = array(
0=>'scrypt', 1=>'sha256', 2=>'groestl', 3=>'skein', 4=>'qubit'
);
@ -155,8 +158,8 @@ function versionToAlgo($coin, $version)
7 =>'nist5', 8 =>'groestl', 9=>'penta', 10=>'whirl',
11=>'luffa', 12=>'keccak', 13=>'quark', 15=>'bastion'
);
if ($coin->symbol == 'DGB')
return arraySafeVal($algos['DGB'], ($version >> 9) & 7, '');
if ($coin->symbol == 'DGB' || $coin->symbol == 'MYR')
return arraySafeVal($algos[$coin->symbol], ($version >> 9) & 7, '');
else if (isset($algos[$coin->symbol]))
return arraySafeVal($algos[$coin->symbol], $version, '');
return false;