[Blotter-commits] r1523 - in pkg/blotter: . R

[noreply at r-forge.r-project.org]

Author: braverock
Date: 2013-10-09 22:07:02 +0200 (Wed, 09 Oct 2013)
New Revision: 1523

Modified:
   pkg/blotter/DESCRIPTION
   pkg/blotter/R/updateAcct.R
   pkg/blotter/R/updateEndEq.R
Log:
- roll back r1519, Account is not an environment (yet)

Modified: pkg/blotter/DESCRIPTION
===================================================================
--- pkg/blotter/DESCRIPTION	2013-10-09 15:54:44 UTC (rev 1522)
+++ pkg/blotter/DESCRIPTION	2013-10-09 20:07:02 UTC (rev 1523)
@@ -2,7 +2,7 @@
 Type: Package
 Title: Tools for transaction-oriented trading systems
     development.
-Version: 0.8.15
+Version: 0.8.16
 Date: $Date$
 Author: Peter Carl, Brian G. Peterson
 Maintainer: Brian G. Peterson <brian at braverock.com>

Modified: pkg/blotter/R/updateAcct.R
===================================================================
--- pkg/blotter/R/updateAcct.R	2013-10-09 15:54:44 UTC (rev 1522)
+++ pkg/blotter/R/updateAcct.R	2013-10-09 20:07:02 UTC (rev 1523)
@@ -150,7 +150,7 @@
     # This function does not calculate End.Eq 
     
     #account is already an environment, it's been updated in place
-    #assign(paste("account",name,sep='.'),Account, envir=.blotter) 
+    assign(paste("account",name,sep='.'),Account, envir=.blotter) 
     return(name) #not sure this is a good idea
 }
 

Modified: pkg/blotter/R/updateEndEq.R
===================================================================
--- pkg/blotter/R/updateEndEq.R	2013-10-09 15:54:44 UTC (rev 1522)
+++ pkg/blotter/R/updateEndEq.R	2013-10-09 20:07:02 UTC (rev 1523)
@@ -35,7 +35,7 @@
     Account$summary$End.Eq[Dates] <- EndCapital
 	
 	  #account is already an environment, it's been updated in place
-	  #assign(paste("account",aname,sep='.'),Account, envir=.blotter) 
+	  assign(paste("account",aname,sep='.'),Account, envir=.blotter) 
     return(aname) #not sure this is a good idea
 }