[Robast-commits] r510 - in pkg/RobLox: R inst/scripts

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

Author: stamats
Date: 2012-09-11 19:36:21 +0200 (Tue, 11 Sep 2012)
New Revision: 510

Modified:
   pkg/RobLox/R/0pre2160.R
   pkg/RobLox/R/sysdata.rda
   pkg/RobLox/inst/scripts/LMinterpolation.R
Log:
changes according to the idea of Peter, no warnings or errors under R 2.15.1 patched and 2.16.0 - just some notes about no visible bindings ...

Modified: pkg/RobLox/R/0pre2160.R
===================================================================
--- pkg/RobLox/R/0pre2160.R	2012-09-11 14:57:47 UTC (rev 509)
+++ pkg/RobLox/R/0pre2160.R	2012-09-11 17:36:21 UTC (rev 510)
@@ -1,21 +1,55 @@
 ## due to a change to .C in 2.16.0
-setHook(packageEvent("RobLox", "onLoad"),
-        function() RobLox::.setLMfunctions())
 
-.setLMfunctions <- function(){
-  if(getRversion() < "2.16.0"){
-#    RL <- asNamespace("RobLox")
-#    assign(".getA1.locsc", RobLox:::.getA1.locsc.old, envir = RL)
-#    assign(".getA2.locsc", RobLox:::.getA2.locsc.old, envir = RL)
-#    assign(".getA.loc", RobLox:::.getA.loc.old, envir = RL)
-    .getA1.locsc <- .getA1.locsc.old
-    assign(".getA2.locsc", RobLox:::.getA2.locsc.old, envir = RL)
-    assign(".getA.loc", RobLox:::.getA.loc.old, envir = RL)
-    .getA.sc <- .getA.sc.old
-    .geta.locsc <- .geta.locsc.old
-    .geta.sc <- .geta.sc.old
-    .getb.loc <- .getb.loc.old
-    .getb.locsc <- .getb.locsc.old
-    .getb.sc <- .getb.sc.old
-  }
-}
\ No newline at end of file
+.getA1.locsc <- if(getRversion() < "2.16.0"){
+                  function(v) .getA1.locsc.old(v)
+                }else{
+                  function(v) .getA1.locsc.new(v)
+                }
+
+.getA2.locsc <- if(getRversion() < "2.16.0"){
+                  function(v) .getA2.locsc.old(v)
+                }else{
+                  function(v) .getA2.locsc.new(v)
+                }
+
+.geta.locsc <- if(getRversion() < "2.16.0"){
+                  function(v) .geta.locsc.old(v)
+               }else{
+                  function(v) .geta.locsc.new(v)
+               }
+
+.getb.locsc <- if(getRversion() < "2.16.0"){
+                  function(v) .getb.locsc.old(v)
+               }else{
+                  function(v) .getb.locsc.new(v)
+               }
+                
+.getA.sc <- if(getRversion() < "2.16.0"){
+               function(v) .getA.sc.old(v)
+            }else{
+               function(v) .getA.sc.new(v)
+            }
+
+.geta.sc <- if(getRversion() < "2.16.0"){
+               function(v) .geta.sc.old(v)
+            }else{
+               function(v) .geta.sc.new(v)
+            }
+
+.getb.sc <- if(getRversion() < "2.16.0"){
+               function(v) .getb.sc.old(v)
+            }else{
+               function(v) .getb.sc.new(v)
+            }
+                
+.getA.loc <- if(getRversion() < "2.16.0"){
+                function(v) .getA.loc.old(v)
+             }else{
+                function(v) .getA.loc.new(v)
+             }
+
+.getb.loc <- if(getRversion() < "2.16.0"){
+                function(v) .getb.loc.old(v)
+             }else{
+                function(v) .getb.loc.new(v)
+             }

Modified: pkg/RobLox/R/sysdata.rda
===================================================================
(Binary files differ)

Modified: pkg/RobLox/inst/scripts/LMinterpolation.R
===================================================================
--- pkg/RobLox/inst/scripts/LMinterpolation.R	2012-09-11 14:57:47 UTC (rev 509)
+++ pkg/RobLox/inst/scripts/LMinterpolation.R	2012-09-11 17:36:21 UTC (rev 510)
@@ -75,17 +75,7 @@
        file = "savedataNew.rda")
 }
 
-.getA1.locsc <- .getA1.locsc.new
-.getA2.locsc <- .getA2.locsc.new
-.getA.loc <- .getA.loc.new
-.getA.sc <- .getA.sc.new
-.geta.locsc <- .geta.locsc.new
-.geta.sc <- .geta.sc.new
-.getb.locsc <- .getb.locsc.new
-.getb.loc <- .getb.loc.new
-.getb.sc <- .getb.sc.new
-
-
+## Saving the results in sysdata.rda
 #load("sysdata.rda")
 #load("savedataOld.rda")
 #load("savedataNew.rda")
@@ -94,7 +84,5 @@
 #     .getA.loc.new, .getA.loc.old, .geta.locsc.new, .geta.locsc.old, 
 #     .geta.sc.new, .getA.sc.new, .geta.sc.old, .getA.sc.old, 
 #     .getb.loc.new, .getb.loc.old, .getb.locsc.new, .getb.locsc.old, 
-#     .getb.sc.new, .getb.sc.old, .getA1.locsc, .getA2.locsc, 
-#     .getA.loc, .getA.sc, .geta.locsc, .geta.sc, .getb.locsc,
-#     .getb.loc, .getb.sc, file = "sysdata.rda")
+#     .getb.sc.new, .getb.sc.old, file = "sysdata.rda")