Expose Factor in Query

yellowbean · Jul 22, 2023 · ca8d5db · ca8d5db
1 parent 9763a1d
commit ca8d5db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Deal/DealAction.hs b/src/Deal/DealAction.hs
@@ -680,10 +680,10 @@ performAction d t@TestDeal{bonds=bndMap,accounts=accMap} (W.PayPrinBy (DS ds) an
   t {accounts = accMapAfterPay, bonds = bndMapAfterPay}
   where
     availBal = A.accBalance $ accMap Map.! an
-    targetBnd = bndMap Map.! bndName
+    targetBndBal = L.bndBalance $ bndMap Map.! bndName
 
     patchedDs = patchDateToStats d ds 
-    payAmount = min availBal (queryDeal t patchedDs) -- `debug` ("Query with "++show (patchedDs))
+    payAmount = min targetBndBal $ min availBal (queryDeal t patchedDs) -- `debug` ("Query with "++show (patchedDs))
 
     accMapAfterPay = Map.adjust
                         (A.draw payAmount d (TxnComments [PayPrin [bndName],UsingDS ds])) 

diff --git a/src/Deal/DealQuery.hs b/src/Deal/DealQuery.hs
@@ -338,10 +338,13 @@ queryDeal t s =
 
     FloorAndCap floor cap s -> max (queryDeal t floor) $ min (queryDeal t cap) (queryDeal t s)
 
+    Factor s f -> mulBR (queryDeal t s) f
+
     FloorWith s floor -> max (queryDeal t s) (queryDeal t floor)
     FloorWithZero s -> max (queryDeal t s) 0
     CapWith s cap -> min (queryDeal t s) (queryDeal t cap)
     Round ds rb -> roundingBy rb (queryDeal t ds)
+
 
     _ -> 0.0 `debug` ("Failed to query balance of -> "++ show s)