fix UT

Author: yellowbean

app/Main.hs

@@ -426,9 +426,9 @@ runRootFinderBy (RootFinderReq req@(dt,Just assumps,nonPerfAssump@AP.NonPerfAssu
         def = RiddersParam { riddersMaxIter = itertimes, riddersTol = RelTol 0.000001}
         riddersFn = case tweak of
                       SplitFixedBalance _ _ (l,h) -> ridders def (min h 0.99, max l 0.00001)
-		      StressPoolDefault (l,h)  -> ridders def (h ,max l 0.00)
-		      StressPoolPrepayment (l,h) -> ridders def (h ,max l 0.00)
-		      MaxSpreadTo _ (l,h) -> ridders def (h ,max l 0.00)
+                      StressPoolDefault (l,h)  -> ridders def (h ,max l 0.00)
+                      StressPoolPrepayment (l,h) -> ridders def (h ,max l 0.00)
+                      MaxSpreadTo _ (l,h) -> ridders def (h ,max l 0.00)
       in
         case riddersFn (rootFindAlgo req tweak stop) of
           Root r -> return $ RFResult r (doTweak r tweak req)

src/Deal/DealRun.hs

@@ -2,6 +2,7 @@
 
 module Deal.DealRun (
    run
+   ,accrueRC
 ) where
 
 import qualified Data.Set as S
@@ -296,8 +297,6 @@ appendCollectedCF d t@TestDeal { pool = pt } poolInflowMap
       t {pool = newPt}  --  `debug` ("after insert bal"++ show newPt)
 
 
-
-
 run :: Ast.Asset a => TestDeal a -> Map.Map PoolId CF.PoolCashflow -> Maybe [ActionOnDate] -> Maybe [RateAssumption] -> Maybe ([Pre],[Pre])
         -> Maybe (Map.Map String (RevolvingPool,AP.ApplyAssumptionType)) -> DL.DList ResultComponent 
         -> Either String (TestDeal a, DL.DList ResultComponent, Map.Map PoolId CF.PoolCashflow)

test/DealTest/ResecDealTest.hs

@@ -121,7 +121,7 @@ resecDeal = D.TestDeal {
                          ]
            )
   ,D.pool = D.ResecDeal (Map.fromList [(DealBondFlow "base case" "A" (toDate "20200101") 0.25
-                                        , D.UnderlyingDeal baseCase CF.emptyCashflow CF.emptyCashflow Nothing)])
+                                        , D.UnderlyingDeal baseCase (Just CF.emptyCashflow) (Just CF.emptyCashflow) Nothing)])
    ,D.waterfall = Map.fromList [(W.DistributionDay Amortizing, [
                                  (W.PayInt Nothing "General" ["A"] Nothing)
                                  ,(W.PayPrin Nothing "General" ["A"] Nothing)

test/UT/AssetTest.hs

@@ -641,11 +641,11 @@ delinqScheduleCFTest =
                       ,A.DummyDefaultAssump))
 
     poolCf = fst . head $ 
-               case D.runPool pool assump1 Nothing of
+               case P.runPool pool assump1 Nothing of
                  Left errorMsg -> undefined `debug` ("Error in pool run"++show errorMsg)
                  Right x -> x  `debug` ("pool run resp"++show x)
     poolCf2 = fst . head $ 
-                case D.runPool pool assump2 Nothing of
+                case P.runPool pool assump2 Nothing of
                   Left _ -> undefined
                   Right x -> x
   in 

test/UT/RateHedgeTest.hs

@@ -9,7 +9,7 @@ import Lib
 import Types
 import Util
 import Stmt
-import Deal (accrueRC)
+import Deal.DealRun (accrueRC)
 import Data.Ratio 
 import UT.DealTest (td2)
 import Hedge (RateSwap(..),RateCap(..),RateSwapBase(..),rcNetCash)