From a6413b3653cb9f530440a06a2ffc8f6c05c9643e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20K=C3=B6nnecke?= <simonkoennecke@gmail.com>
Date: Tue, 5 Jul 2016 12:57:35 +0200
Subject: [PATCH] avg fix
---
.../actions/statistics/ActionInterchangeState.java | 4 ++++
.../configurations/StatisticsWalletConfiguration.java | 4 ++--
src/main/java/fucoin/wallet/WalletStatistics.java | 11 ++---------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/fucoin/actions/statistics/ActionInterchangeState.java b/src/main/java/fucoin/actions/statistics/ActionInterchangeState.java
index 8d06ab5..b69955e 100644
--- a/src/main/java/fucoin/actions/statistics/ActionInterchangeState.java
+++ b/src/main/java/fucoin/actions/statistics/ActionInterchangeState.java
@@ -21,6 +21,10 @@ public class ActionInterchangeState extends ClientAction {
@Override
protected void onAction(ActorRef sender, ActorRef self, UntypedActorContext context, AbstractWallet abstractNode) {
+ if (abstractNode.getStatistics().getAvg() == -1) {
+ abstractNode.getStatistics().setAvg(abstractNode.getAmount());
+ }
abstractNode.getStatistics().update(currentAmount);
+
}
}
diff --git a/src/main/java/fucoin/configurations/StatisticsWalletConfiguration.java b/src/main/java/fucoin/configurations/StatisticsWalletConfiguration.java
index 14daba8..8324e68 100644
--- a/src/main/java/fucoin/configurations/StatisticsWalletConfiguration.java
+++ b/src/main/java/fucoin/configurations/StatisticsWalletConfiguration.java
@@ -89,7 +89,7 @@ public class StatisticsWalletConfiguration extends AbstractConfiguration {
numberOfInterchangeStatistic--;
if (numberOfInterchangeStatistic == 0) {
- createDump();
+ createSnapshot();
} else {
interchangeStatistic(numberOfInterchangeStatistic);
}
@@ -98,7 +98,7 @@ public class StatisticsWalletConfiguration extends AbstractConfiguration {
/**
* Create a Dump of the SuperVisor and all active Wallets.
*/
- private void createDump() {
+ private void createSnapshot() {
superVisor.tell(new ActionCreateSuperVisorSnapshot(LocalDateTime.now()), self());
}
diff --git a/src/main/java/fucoin/wallet/WalletStatistics.java b/src/main/java/fucoin/wallet/WalletStatistics.java
index 2decf8f..532e773 100644
--- a/src/main/java/fucoin/wallet/WalletStatistics.java
+++ b/src/main/java/fucoin/wallet/WalletStatistics.java
@@ -15,21 +15,14 @@ public class WalletStatistics implements Serializable {
public WalletStatistics() {
this.min = Integer.MAX_VALUE;
this.max = Integer.MIN_VALUE;
- this.avg = 0;
+ this.avg = -1;
this.count = 0;
}
- public WalletStatistics(int min, int max, int avg, int count) {
- this.min = min;
- this.max = max;
- this.avg = avg;
- this.count = count;
- }
-
public void update(int currentWalletAmount) {
setMin(currentWalletAmount);
setMax(currentWalletAmount);
- setAvg((getAvg() + currentWalletAmount) / 2);
+ setMax((getAvg() + currentWalletAmount) / 2);
}
public int getMin() {
--
GitLab