Skip to content

Commit

Permalink
Final small changes. Ready for initial-release
Browse files Browse the repository at this point in the history
  • Loading branch information
AgeManning committed Jul 20, 2016
1 parent e6e9448 commit d980f32
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
into our index.html and then runs a html server on localhost:9001
6 changes: 3 additions & 3 deletions app/error-handling/error-handling-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/landing-page/landing-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h1>Cryptocurrency Mining Calculator</h1>
<h2>Statistical Forecasting</h2>
<hr>
<p>This gives estimations of potential profits and loss for cryptocurrency mining.</p>
<p>It provides various advanced statistics for miners given a input variables (eg, hashrate, difficulty, power costs etc).</p>
<p>It provides various advanced statistics for miners given input variables (eg, hashrate, difficulty, power costs etc).</p>
<p>Capable of difficulty prediction using real-time blockchain statistics using some cool math.</p>
<p><a class="btn btn-primary btn-lg visible-sm" ui-sref="forecaster" role="button">Launch Statistical Forecaster</a></p>
</div>
Expand Down
2 changes: 0 additions & 2 deletions app/miner-performance/miner-performance-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand All @@ -140,7 +139,6 @@ angular.module('ethMiningCalc')

//TODO: Paul UI Repsonse
var invalidObjects = validationService.validateAnalyse(userInputs);
console.log(invalidObjects);

resolve(analysePerformance(userInputs.blockTime));

Expand Down
2 changes: 1 addition & 1 deletion app/validation-service/validation-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit d980f32

Please sign in to comment.