[Robast-commits] r1112 - in branches/robast-1.2/pkg/ROptEst: R inst

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

Author: ruckdeschel
Date: 2018-08-10 01:46:38 +0200 (Fri, 10 Aug 2018)
New Revision: 1112

Modified:
   branches/robast-1.2/pkg/ROptEst/R/roptest.new.R
   branches/robast-1.2/pkg/ROptEst/inst/NEWS
Log:
[ROptEst] branch 1.2:
inserted code for time checking (which is inactive usually; only if in kStepEstimator.R in 
  RobAStBase, the respective ##-t-## lines are de-commented the timings are visible as
  attribute "kStepTimings" in the result of roptest ...)


Modified: branches/robast-1.2/pkg/ROptEst/R/roptest.new.R
===================================================================
--- branches/robast-1.2/pkg/ROptEst/R/roptest.new.R	2018-08-09 23:43:02 UTC (rev 1111)
+++ branches/robast-1.2/pkg/ROptEst/R/roptest.new.R	2018-08-09 23:46:38 UTC (rev 1112)
@@ -137,10 +137,12 @@
     retV at robestCall <- quote(retV at estimate.call)
     retV at estimate.call <- mc
     tim <- attr(retV,"timings")
+    timK <- attr(retV,"kStepTimings")
 
     retV <- as(as(retV,"kStepEstimate"), "ORobEstimate")
     retV <- .checkEstClassForParamFamily(L2Fam,retV)
     attr(retV,"timings") <- tim
+    attr(retV,"kStepTimings") <- timK
     retV at roptestCall <- mc
     return(retV)
 }
@@ -361,8 +363,9 @@
                             withEvalAsVar = withEvalAsVarkStep,
                             withMakeIC = withMakeICkStep)
                             })
+       sy.OnlykStep <- attr(res,"timings")
        if (withTimings) print(sy.kStep)
-
+       if (withTimings && !is.null(sy.OnlykStep)) print(sy.OnlykStep)
     if(!debug){
          if(mwt) es.call$withTimings <- withTimings
          res at estimate.call <- es.call
@@ -393,5 +396,6 @@
     res at completecases <- completecases
     res at start <- initial.est
     attr(res, "timings") <- sy
+    attr(res, "kStepTimings") <- sy.OnlykStep
     return(res)
 }

Modified: branches/robast-1.2/pkg/ROptEst/inst/NEWS
===================================================================
--- branches/robast-1.2/pkg/ROptEst/inst/NEWS	2018-08-09 23:43:02 UTC (rev 1111)
+++ branches/robast-1.2/pkg/ROptEst/inst/NEWS	2018-08-09 23:46:38 UTC (rev 1112)
@@ -26,6 +26,9 @@
 + some buglets in getStartIC 
 + some tedious debugging in getStartIClcsc.R
 + clarified if clauses in roptest.new (and removed .with.checkEstClassForParamFamily from dots to be sure)
++ inserted code for time checking (which is inactive usually; only if in kStepEstimator.R in 
+  RobAStBase, the respective ##-t-## lines are de-commented the timings are visible as
+  attribute "kStepTimings" in the result of roptest ...)
 
 #######################################
 version 1.1