Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-02 19:56:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix average calculation in trade charts view

Browse source
This commit is contained in:
woodser 2025-06-29 13:49:12 -04:00 • committed by woodser
parent 8cca2cbb52
commit 3546d3d931
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
desktop/src/main/java/haveno/desktop/main/market/trades/ChartCalculations.java
View file

@ -76,7 +76,7 @@ public class ChartCalculations {
dateMapsPerTickUnit.forEach((tick, map) -> { dateMapsPerTickUnit.forEach((tick, map) -> {
HashMap<Long, Long> priceMap = new HashMap<>(); HashMap<Long, Long> priceMap = new HashMap<>();
map.forEach((date, tradeStatisticsList) -> priceMap.put(date, getAveragePrice(tradeStatisticsList))); map.forEach((date, tradeStatisticsList) -> priceMap.put(date, getAverageTraditionalPrice(tradeStatisticsList)));
usdAveragePriceMapsPerTickUnit.put(tick, priceMap); usdAveragePriceMapsPerTickUnit.put(tick, priceMap);
}); });
return usdAveragePriceMapsPerTickUnit; return usdAveragePriceMapsPerTickUnit;
@ -210,7 +210,7 @@ public class ChartCalculations {
return roundToTick(time.toInstant().atZone(ChartCalculations.ZONE_ID).toLocalDateTime(), tickUnit); return roundToTick(time.toInstant().atZone(ChartCalculations.ZONE_ID).toLocalDateTime(), tickUnit);
} }
private static long getAveragePrice(List<TradeStatistics3> tradeStatisticsList) { private static long getAverageTraditionalPrice(List<TradeStatistics3> tradeStatisticsList) {
long accumulatedAmount = 0; // TODO: use BigInteger long accumulatedAmount = 0; // TODO: use BigInteger
long accumulatedVolume = 0; long accumulatedVolume = 0;
for (TradeStatistics3 tradeStatistics : tradeStatisticsList) { for (TradeStatistics3 tradeStatistics : tradeStatisticsList) {
@ -262,7 +262,7 @@ public class ChartCalculations {
boolean isBullish; boolean isBullish;
if (CurrencyUtil.isCryptoCurrency(currencyCode)) { if (CurrencyUtil.isCryptoCurrency(currencyCode)) {
isBullish = close < open; isBullish = close < open;
double accumulatedAmountAsDouble = MathUtils.scaleUpByPowerOf10((double) accumulatedAmount, 4 + CryptoMoney.SMALLEST_UNIT_EXPONENT); double accumulatedAmountAsDouble = MathUtils.scaleUpByPowerOf10((double) accumulatedAmount, CryptoMoney.SMALLEST_UNIT_EXPONENT - 4);
averagePrice = MathUtils.roundDoubleToLong(accumulatedAmountAsDouble / accumulatedVolume); averagePrice = MathUtils.roundDoubleToLong(accumulatedAmountAsDouble / accumulatedVolume);
} else { } else {
isBullish = close > open; isBullish = close > open;