From d980f328041dd8313f5bdc50ff9856f3391d8664 Mon Sep 17 00:00:00 2001 From: Age Date: Wed, 20 Jul 2016 12:53:35 +1000 Subject: [PATCH] Final small changes. Ready for initial-release --- README.md | 8 +++++--- app/error-handling/error-handling-service.js | 6 +++--- .../forecaster-input-single-value-controller.js | 2 +- app/landing-page/landing-page.html | 2 +- app/miner-performance/miner-performance-service.js | 2 -- app/validation-service/validation-service.js | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8e47f4b..14acd0d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ # EthereumMiningCalculator -Basic Statistics Useful for Mining Ethereum +Advanced Statistics for Mining Ethereum and other Cryptocurrencies. +Available at: [www.TheCalc.io](www.thecalc.io) + +This project is still under development, there may be bugs. -Currently under development, don't trust it just yet. ## Getting Started @@ -29,4 +31,4 @@ to our index.html. #### Grunt Grunt does menial tasks. Grunt automatically inserts script and link tags (from bower_components and the app folder) -into our index.html and then runs a html server on localhost:9001 \ No newline at end of file +into our index.html and then runs a html server on localhost:9001 diff --git a/app/error-handling/error-handling-service.js b/app/error-handling/error-handling-service.js index 2e082f7..f179fea 100644 --- a/app/error-handling/error-handling-service.js +++ b/app/error-handling/error-handling-service.js @@ -62,15 +62,15 @@ angular.module('ethMiningCalc') break; case "PINF": - raiseAlert("Can't calculate probabilities. Inputs are too hectic"); + raiseAlert("Can't calculate probabilities. Inputs are incalculable"); break; case "EINF": - raiseAlert("Can't calculate expectation. Inputs are too hectic"); + raiseAlert("Can't calculate expectation. Inputs are incalculable"); break; case "VINF": - raiseAlert("Can't calculate variance. Inputs are too hectic"); + raiseAlert("Can't calculate variance. Inputs are incalculable"); break; case "MPNOB": diff --git a/app/forecaster/forecaster-input-single-value/forecaster-input-single-value-controller.js b/app/forecaster/forecaster-input-single-value/forecaster-input-single-value-controller.js index 6dfb38b..7b92580 100644 --- a/app/forecaster/forecaster-input-single-value/forecaster-input-single-value-controller.js +++ b/app/forecaster/forecaster-input-single-value/forecaster-input-single-value-controller.js @@ -50,7 +50,7 @@ angular.module('ethMiningCalc') // Some components are allowed 0's others are not // Returns true if invalid var validateZeros = function(value) { - var allowedZeros = ['initialInvestment', 'electricityUsage', 'electricityRate','pastBlocks']; + var allowedZeros = ['initialInvestment', 'electricityUsage', 'electricityRate','pastBlocks','predictiveDifficultyAValue','predictiveDifficultyBValue', 'predictiveDifficultyCValue']; if (allowedZeros.indexOf($scope.componentId) <= -1) { //Not the allowed zero's if (value == 0){ $scope.isZero=true; diff --git a/app/landing-page/landing-page.html b/app/landing-page/landing-page.html index 9e743fc..6c179d2 100644 --- a/app/landing-page/landing-page.html +++ b/app/landing-page/landing-page.html @@ -10,7 +10,7 @@

Cryptocurrency Mining Calculator

Statistical Forecasting


This gives estimations of potential profits and loss for cryptocurrency mining.

-

It provides various advanced statistics for miners given a input variables (eg, hashrate, difficulty, power costs etc).

+

It provides various advanced statistics for miners given input variables (eg, hashrate, difficulty, power costs etc).

Capable of difficulty prediction using real-time blockchain statistics using some cool math.

Launch Statistical Forecaster

diff --git a/app/miner-performance/miner-performance-service.js b/app/miner-performance/miner-performance-service.js index 52be33c..f7e7461 100644 --- a/app/miner-performance/miner-performance-service.js +++ b/app/miner-performance/miner-performance-service.js @@ -128,7 +128,6 @@ angular.module('ethMiningCalc') .then(function(blockTime){ //TODO: Paul UI Repsonse var invalidObjects = validationService.validateAnalyse(userInputs); - console.log(invalidObjects); resolve(analysePerformance(blockTime)); //Resolve a promise with the data we need }) @@ -140,7 +139,6 @@ angular.module('ethMiningCalc') //TODO: Paul UI Repsonse var invalidObjects = validationService.validateAnalyse(userInputs); - console.log(invalidObjects); resolve(analysePerformance(userInputs.blockTime)); diff --git a/app/validation-service/validation-service.js b/app/validation-service/validation-service.js index b024183..010d8c6 100644 --- a/app/validation-service/validation-service.js +++ b/app/validation-service/validation-service.js @@ -154,7 +154,7 @@ angular.module('ethMiningCalc') }; var validateNumber = function(number){ - if (typeof number !== 'number' || isNaN(number) || number === 0) + if (typeof number !== 'number' || isNaN(number)) return false; return true; };