small corrections

Author: jberthold

Instruments_test.sml

@@ -1,4 +1,4 @@
-structure Instruments_Test = struct
+structure Instruments_test = struct
 open Currency Contract Instruments
 fun pr s c = print (s ^ ":\n " ^ ppContr c ^ "\n")              
 

loadscript

@@ -2,7 +2,7 @@
 (* load required modules *)
 app load ["Math", "Date", "Bool", "ListPair", "IntInf", "CharVector"];
 
-app use ["DateUtil.sml", "ListSort.sig", "ListSort.sml", "CURRENCY.sig", "Currency.sml", "ContractBase.sml", "CONTRACT.sig", "Contract.sml", "Instruments.sml", "ContractTransform.sml", "ContractMonad.sml"];
+app use ["DateUtil.sml", "ListSort.sig", "ListSort.sml", "CURRENCY.sig", "Currency.sml", "ContractBase.sml", "CONTRACT.sig", "Contract.sig", "Contract.sml", "Instruments.sml", "ContractTransform.sml", "ContractMonad.sml"];
 
 (* bring contract "constructors" in direct scope *)
 open Currency Contract Instruments;

portfolio.sml

@@ -41,8 +41,8 @@ val forwards =
     ]
 
 (* everything together (using "all" constructor) is the portfolio *)
-val fxPortfolio = all (singleBarriers @ doubleBarriers @
-                       touchOptions @ vanillas @ forwards)
+val fxPortfolio = Contract.all (singleBarriers @ doubleBarriers @
+                                touchOptions @ vanillas @ forwards)
 
 end