refactor opening price calc

Shahriar-0 · Jun 1, 2024 · c733dba · c733dba
1 parent ef629ef
commit c733dba
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/TinyME_v2.0/src/main/java/ir/ramtung/tinyme/domain/service/Matcher.java b/TinyME_v2.0/src/main/java/ir/ramtung/tinyme/domain/service/Matcher.java
@@ -22,13 +22,13 @@ public Matcher(ContinuousMatchingControl continuousMatchingControl, AuctionMatch
 	}
 
 	private boolean hasOrderForAuction(OrderBook orderBook) {
-		return orderBook.hasOrderOfType(Side.BUY) &&
-				orderBook.hasOrderOfType(Side.SELL);
+		return orderBook.hasOrderOfType(Side.BUY) && orderBook.hasOrderOfType(Side.SELL);
 	}
 
 	public int calcOpeningAuctionPrice(OrderBook orderBook, int lastTradePrice) {
-		if(!hasOrderForAuction(orderBook))
+		if(!hasOrderForAuction(orderBook)) {
 			return lastTradePrice;
+		}
 
 		int maxTradableQuantity = 0;
 		int openingPrice = lastTradePrice; 
@@ -37,18 +37,21 @@ public int calcOpeningAuctionPrice(OrderBook orderBook, int lastTradePrice) {
 
 		for (int price = minPrice; price <= maxPrice; price++) {
 			int currentTradableQuantity = calcTradableQuantity(orderBook, price);
-			if (currentTradableQuantity > maxTradableQuantity) {
+			if (shouldUpdateOpeningAuctionPrice(openingPrice, price, lastTradePrice, maxTradableQuantity, currentTradableQuantity)) {
 				openingPrice = price;
 				maxTradableQuantity = currentTradableQuantity;
-			} 
-			else if (currentTradableQuantity == maxTradableQuantity && Math.abs(price - lastTradePrice) < Math.abs(openingPrice - lastTradePrice)) {
-				openingPrice = price;
 			}
 		}
 
 		return openingPrice;
 	}
 
+	private boolean shouldUpdateOpeningAuctionPrice(int openingPrice, int newOpeningPrice, int lastTradePrice, int openingTradableQuantity, int newOpeningTradableQuantity) {
+		return newOpeningTradableQuantity > openingTradableQuantity || 
+				(newOpeningTradableQuantity == openingTradableQuantity && 
+				Math.abs(newOpeningPrice - lastTradePrice) < Math.abs(openingPrice - lastTradePrice));
+	}
+
 	public int calcTradableQuantity(OrderBook orderBook, int openingPrice) {
 		int buysQuantity = calcTradableQuantityInQueue(orderBook.getBuyQueue(), openingPrice);
 		int sellsQuantity = calcTradableQuantityInQueue(orderBook.getSellQueue(), openingPrice);;