wowario
/
diff-chart
forked from wownero/diff-chart
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

further fixes with offsetting

Browse Source
gh-pages
stoffu 5 years ago
parent fb8ea79ce9
commit ba0739c87c
No known key found for this signature in database
GPG Key ID: 41DAB8343A9EC012
29 changed files with 79 additions and 52 deletions
Show Stats Download Patch File Download Diff File

2
aeon-1.html
Unescape View File

@ -25,7 +25,7 @@
var chart = get_chart([].concat(
chartData_10,
chartData_11,
), aeon_config);
), aeon_config, aeon_offset_1);
function toggleLogScale() {
chart.valueAxes[0].logarithmic = document.getElementById("log_scale").checked;

3
aeon-bc-size-1.html
Unescape View File

@ -18,13 +18,14 @@
<script src="data/aeon-data-10.js"></script>
<script src="data/aeon-data-11.js"></script>
<script src="js/bc-size.js"></script>
<script src="aeon-config.js"></script>
<!-- Chart code -->
<script>
var chart = get_chart([].concat(
chartData_10,
chartData_11,
));
), aeon_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

2
aeon-block-reward-1.html
Unescape View File

@ -25,7 +25,7 @@
var chart = get_chart([].concat(
chartData_10,
chartData_11,
), aeon_config);
), aeon_config, aeon_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

3
aeon-block-size-1.html
Unescape View File

@ -18,13 +18,14 @@
<script src="data/aeon-data-10.js"></script>
<script src="data/aeon-data-11.js"></script>
<script src="js/block-size.js"></script>
<script src="aeon-config.js"></script>
<!-- Chart code -->
<script>
var chart = get_chart([].concat(
chartData_10,
chartData_11,
));
), aeon_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

3
aeon-block-time-1.html
Unescape View File

@ -18,13 +18,14 @@
<script src="data/aeon-data-10.js"></script>
<script src="data/aeon-data-11.js"></script>
<script src="js/block-time.js"></script>
<script src="aeon-config.js"></script>
<!-- Chart code -->
<script>
var chart = get_chart([].concat(
chartData_10,
chartData_11,
));
), aeon_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

7
aeon-coin-supply-1.html
Unescape View File

@ -23,15 +23,10 @@
<!-- Chart code -->
<script>
var offset = {
height: 1000000,
supply: bigInt("16230799273689217059"),
supply_proj: bigInt("16234708945129113452")
};
var chart = get_chart([].concat(
chartData_10,
chartData_11,
), aeon_config, offset);
), aeon_config, aeon_offset_1);
function toggleProj() {
chart.graphs[1].hidden = !document.getElementById("proj").checked;

7
aeon-config.js
Unescape View File

@ -25,3 +25,10 @@ var aeon_config = {
return this.EMISSION_SPEED_FACTOR_PER_MINUTE - int_log2(target_minutes);
},
};
var aeon_offset_1 = {
height: 1000000,
supply: "16230799273689217059",
supply_proj: "16234708945129113452",
bc_size: 2745344988,
};

3
aeon-nonce-1.html
Unescape View File

@ -18,13 +18,14 @@
<script src="data/aeon-data-10.js"></script>
<script src="data/aeon-data-11.js"></script>
<script src="js/nonce.js"></script>
<script src="aeon-config.js"></script>
<!-- Chart code -->
<script>
var chart = get_chart([].concat(
chartData_10,
chartData_11,
));
), aeon_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

3
aeon-ring-size-1.html
Unescape View File

@ -17,6 +17,7 @@
<script src="data/aeon-data-10.js"></script>
<script src="data/aeon-data-11.js"></script>
<script src="js/ring-size.js"></script>
<script src="aeon-config.js"></script>
<!-- Chart code -->
<script>
@ -25,7 +26,7 @@ var chart = get_chart(
chartData_10,
chartData_11,
),
[1,2,3,4,5,6,7,8,9,10,15,20,50,100]
[1,2,3,4,5,6,7,8,9,10,15,20,50,100], aeon_offset_1
);
function togglePan() {

3
aeon-tx-per-day-1.html
Unescape View File

@ -17,13 +17,14 @@
<script src="data/aeon-data-10.js"></script>
<script src="data/aeon-data-11.js"></script>
<script src="js/tx-per-day.js"></script>
<script src="aeon-config.js"></script>
<!-- Chart code -->
<script>
var chart = get_chart([].concat(
chartData_10,
chartData_11,
));
), aeon_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

9
js/bc-size.js
Unescape View File

@ -1,10 +1,13 @@
function get_chart(chartData) {
chartData.shift();
function get_chart(chartData, offset) {
if (offset === undefined)
chartData.shift();
for (var i = 0; i < chartData.length; ++i) {
chartData[i].date = new Date(1000 * chartData[i][0]);
chartData[i].height = i + 1;
chartData[i].height = i + (offset === undefined ? 1 : offset.height);
chartData[i].bc_size = chartData[i][4];
if (i === 0 && offset !== undefined)
chartData[i].bc_size += offset.bc_size;
if (i > 0)
chartData[i].bc_size += chartData[i - 1].bc_size;
chartData[i].bc_size_str = formatBytes(chartData[i].bc_size, 3);

7
js/block-reward.js
Unescape View File

@ -1,9 +1,10 @@
function get_chart(chartData, cryptonote_config) {
chartData.shift();
function get_chart(chartData, cryptonote_config, offset) {
if (offset === undefined)
chartData.shift();
for (var i = 0; i < chartData.length; ++i) {
chartData[i].date = new Date(1000 * chartData[i][0]);
chartData[i].height = i + 1;
chartData[i].height = i + (offset === undefined ? 1 : offset.height);
chartData[i].reward = print_money(chartData[i][3], cryptonote_config.CRYPTONOTE_DISPLAY_DECIMAL_POINT);
}

7
js/block-size.js
Unescape View File

@ -1,9 +1,10 @@
function get_chart(chartData) {
chartData.shift();
function get_chart(chartData, offset) {
if (offset === undefined)
chartData.shift();
for (var i = 0; i < chartData.length; ++i) {
chartData[i].date = new Date(1000 * chartData[i][0]);
chartData[i].height = i + 1;
chartData[i].height = i + (offset === undefined ? 1 : offset.height);
chartData[i].block_size = chartData[i][4];
chartData[i].block_size_str = formatBytes(chartData[i].block_size, 3);
}

5
js/block-time.js
Unescape View File

@ -1,5 +1,6 @@
function get_chart(chartData) {
chartData.shift();
function get_chart(chartData, offset) {
if (offset === undefined)
chartData.shift();
var chartData_bt = [];
var block_date = null;

7
js/coin-supply.js
Unescape View File

@ -1,7 +1,7 @@
function get_chart(chartData, cryptonote_config, offset) {
for (var i = 0; i < chartData.length; ++i) {
chartData[i].date = new Date(1000 * chartData[i][0]);
chartData[i].height = i;
chartData[i].height = i + (offset === undefined ? 0 : offset.height);
chartData[i].coin_supply = bigInt(chartData[i][3]);
for (var j = 0; j < chartData[i][5].length; ++j)
chartData[i].coin_supply = chartData[i].coin_supply.minus(chartData[i][5][j][4]); // subtract fees
@ -15,7 +15,7 @@ function get_chart(chartData, cryptonote_config, offset) {
var target = cryptonote_config.get_difficulty_target((offset === undefined ? 0 : offset.height) + i);
var target_minutes = target / 60;
var emission_speed_factor = cryptonote_config.get_emission_speed_factor(target_minutes);
var already_generated_coins = i == 0 ? (offset === undefined ? bigInt(0) : offset.supply_proj) : chartData[i - 1].coin_supply_proj;
var already_generated_coins = i == 0 ? (offset === undefined ? bigInt(0) : bigInt(offset.supply_proj)) : chartData[i - 1].coin_supply_proj;
var base_reward = bigInt(cryptonote_config.MONEY_SUPPLY).minus(already_generated_coins).shiftRight(emission_speed_factor);
if (base_reward.lesser(cryptonote_config.FINAL_SUBSIDY_PER_MINUTE * target_minutes))
{
@ -26,7 +26,8 @@ function get_chart(chartData, cryptonote_config, offset) {
chartData[i].coin_supply_proj_real = chartData[i].coin_supply_proj.toJSNumber() / Math.pow(10, cryptonote_config.CRYPTONOTE_DISPLAY_DECIMAL_POINT);
}
chartData.shift();
if (offset === undefined)
chartData.shift();
var chart = AmCharts.makeChart("chartdiv", {
"type": "serial",

7
js/diff.js
Unescape View File

@ -1,9 +1,10 @@
function get_chart(chartData, cryptonote_config) {
chartData.shift();
function get_chart(chartData, cryptonote_config, offset) {
if (offset === undefined)
chartData.shift();
for (var i = 0; i < chartData.length; ++i) {
chartData[i].date = new Date(1000 * chartData[i][0]);
chartData[i].height = i + 1;
chartData[i].height = i + (offset === undefined ? 1 : offset.height);
chartData[i].difficulty = chartData[i][2];
chartData[i].hashrate = formatHashrate(chartData[i].difficulty / cryptonote_config.get_difficulty_target(chartData[i].height), 2);
}

7
js/nonce.js
Unescape View File

@ -1,11 +1,12 @@
var max_num_bullets = 200000;
function get_chart(chartData) {
chartData.shift();
function get_chart(chartData, offset) {
if (offset === undefined)
chartData.shift();
for (var i = 0; i < chartData.length; ++i) {
chartData[i].date = new Date(1000 * chartData[i][0]);
chartData[i].height = i + 1;
chartData[i].height = i + (offset === undefined ? 1 : offset.height);
chartData[i].nonce = chartData[i][1];
}

5
js/ring-size.js
Unescape View File

@ -1,5 +1,6 @@
function get_chart(chartData, levels) {
chartData.shift();
function get_chart(chartData, levels, offset) {
if (offset === undefined)
chartData.shift();
var chartData_rs = [];
var block_date = null;
var num_txes_per_day = {};

5
js/tx-per-day.js
Unescape View File

@ -1,5 +1,6 @@
function get_chart(chartData) {
chartData.shift();
function get_chart(chartData, offset) {
if (offset === undefined)
chartData.shift();
var chartData_tpd = [];
var block_date = null;

2
monero-1.html
Unescape View File

@ -41,7 +41,7 @@ var chart = get_chart([].concat(
chartData_17,
chartData_18,
chartData_19,
), monero_config);
), monero_config, monero_offset_1);
function toggleLogScale() {
chart.valueAxes[0].logarithmic = document.getElementById("log_scale").checked;

3
monero-bc-size-1.html
Unescape View File

@ -26,6 +26,7 @@
<script src="data/monero-data-18.js"></script>
<script src="data/monero-data-19.js"></script>
<script src="js/bc-size.js"></script>
<script src="monero-config.js"></script>
<!-- Chart code -->
<script>
@ -40,7 +41,7 @@ var chart = get_chart([].concat(
chartData_17,
chartData_18,
chartData_19,
));
), monero_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

2
monero-block-reward-1.html
Unescape View File

@ -41,7 +41,7 @@ var chart = get_chart([].concat(
chartData_17,
chartData_18,
chartData_19,
), monero_config);
), monero_config, monero_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

3
monero-block-size-1.html
Unescape View File

@ -26,6 +26,7 @@
<script src="data/monero-data-18.js"></script>
<script src="data/monero-data-19.js"></script>
<script src="js/block-size.js"></script>
<script src="monero-config.js"></script>
<!-- Chart code -->
<script>
@ -40,7 +41,7 @@ var chart = get_chart([].concat(
chartData_17,
chartData_18,
chartData_19,
));
), monero_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

3
monero-block-time-1.html
Unescape View File

@ -26,6 +26,7 @@
<script src="data/monero-data-18.js"></script>
<script src="data/monero-data-19.js"></script>
<script src="js/block-time.js"></script>
<script src="monero-config.js"></script>
<!-- Chart code -->
<script>
@ -40,7 +41,7 @@ var chart = get_chart([].concat(
chartData_17,
chartData_18,
chartData_19,
));
), monero_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

7
monero-coin-supply-1.html
Unescape View File

@ -31,11 +31,6 @@
<!-- Chart code -->
<script>
var offset = {
height: 1000000,
supply: bigInt("11319902360375037196"),
supply_proj: bigInt("11338799512357636715")
};
var chart = get_chart([].concat(
chartData_10,
chartData_11,
@ -47,7 +42,7 @@ var chart = get_chart([].concat(
chartData_17,
chartData_18,
chartData_19,
), monero_config, offset);
), monero_config, monero_offset_1);
function toggleProj() {
chart.graphs[1].hidden = !document.getElementById("proj").checked;

7
monero-config.js
Unescape View File

@ -12,3 +12,10 @@ var monero_config = {
return this.EMISSION_SPEED_FACTOR_PER_MINUTE - (target_minutes - 1);
},
};
var monero_offset_1 = {
height: 1000000,
supply: bigInt("11319902360375037196"),
supply_proj: bigInt("11338799512357636715"),
bc_size: 2630363526,
};

3
monero-nonce-1.html
Unescape View File

@ -26,6 +26,7 @@
<script src="data/monero-data-18.js"></script>
<script src="data/monero-data-19.js"></script>
<script src="js/nonce.js"></script>
<script src="monero-config.js"></script>
<!-- Chart code -->
<script>
@ -40,7 +41,7 @@ var chart = get_chart([].concat(
chartData_17,
chartData_18,
chartData_19,
));
), monero_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

3
monero-ring-size-1.html
Unescape View File

@ -25,6 +25,7 @@
<script src="data/monero-data-18.js"></script>
<script src="data/monero-data-19.js"></script>
<script src="js/ring-size.js"></script>
<script src="monero-config.js"></script>
<!-- Chart code -->
<script>
@ -41,7 +42,7 @@ var chart = get_chart(
chartData_18,
chartData_19,
),
[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,40,50,100]
[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,40,50,100], monero_offset_1
);
function togglePan() {

3
monero-tx-per-day-1.html
Unescape View File

@ -25,6 +25,7 @@
<script src="data/monero-data-18.js"></script>
<script src="data/monero-data-19.js"></script>
<script src="js/tx-per-day.js"></script>
<script src="monero-config.js"></script>
<!-- Chart code -->
<script>
@ -39,7 +40,7 @@ var chart = get_chart([].concat(
chartData_17,
chartData_18,
chartData_19,
));
), monero_offset_1);
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;

Write Preview
Loading…
Cancel
Save