[Yuima-commits] r561 - in pkg/yuimaGUI: . inst/yuimaGUI

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

Author: phoenix844
Date: 2017-01-10 11:01:05 +0100 (Tue, 10 Jan 2017)
New Revision: 561

Modified:
   pkg/yuimaGUI/DESCRIPTION
   pkg/yuimaGUI/inst/yuimaGUI/global.R
   pkg/yuimaGUI/inst/yuimaGUI/server.R
   pkg/yuimaGUI/inst/yuimaGUI/ui.R
Log:


Modified: pkg/yuimaGUI/DESCRIPTION
===================================================================
--- pkg/yuimaGUI/DESCRIPTION	2017-01-10 06:38:37 UTC (rev 560)
+++ pkg/yuimaGUI/DESCRIPTION	2017-01-10 10:01:05 UTC (rev 561)
@@ -1,7 +1,7 @@
 Package: yuimaGUI
 Type: Package
 Title: A Graphical User Interface for the 'yuima' Package
-Version: 0.10.0
+Version: 0.10.1
 Author: YUIMA Project Team
 Maintainer: Emanuele Guidotti <emanuele.guidotti at studenti.unimi.it>
 Description: Provides a graphical user interface for the 'yuima' package.

Modified: pkg/yuimaGUI/inst/yuimaGUI/global.R
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/global.R	2017-01-10 06:38:37 UTC (rev 560)
+++ pkg/yuimaGUI/inst/yuimaGUI/global.R	2017-01-10 10:01:05 UTC (rev 561)
@@ -12,10 +12,10 @@
 if(!exists("yuimaGUIdata"))
   yuimaGUIdata <- reactiveValues(series=list(), model=list(), usr_model = list(), simulation=list(), usr_simulation = list(), cp=list(), cpYuima=list(), llag = list(), cluster = list(), hedging = list())
 
-getSimulation <- function(symb, n = 1){
-  return(isolate({yuimaGUIdata$simulation[[symb]][[n]]}))
-}
-
-getSeries <- function(symb){
-  return(isolate({yuimaGUIdata$series[[symb]]}))
-}
+# getSimulation <- function(symb, n = 1){
+#   return(isolate({yuimaGUIdata$simulation[[symb]][[n]]}))
+# }
+# 
+# getSeries <- function(symb){
+#   return(isolate({yuimaGUIdata$series[[symb]]}))
+# }

Modified: pkg/yuimaGUI/inst/yuimaGUI/server.R
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/server.R	2017-01-10 06:38:37 UTC (rev 560)
+++ pkg/yuimaGUI/inst/yuimaGUI/server.R	2017-01-10 10:01:05 UTC (rev 561)
@@ -2623,7 +2623,8 @@
         }
         
         else if (y$info$class=="Compound Poisson" | y$info$class=="Levy process"){
-          threshold <- ifelse(is.na(y$info$threshold), 0, y$info$threshold)          
+          if (is.null(y$info$threshold)) threshold <- 0
+          else threshold <- ifelse(is.na(y$info$threshold), 0, y$info$threshold)          
           x <- as.numeric(y$model at data@zoo.data[[1]])
           dx <- diff(x)
           dx <- dx[abs(dx)>threshold]

Modified: pkg/yuimaGUI/inst/yuimaGUI/ui.R
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/ui.R	2017-01-10 06:38:37 UTC (rev 560)
+++ pkg/yuimaGUI/inst/yuimaGUI/ui.R	2017-01-10 10:01:05 UTC (rev 561)
@@ -193,7 +193,7 @@
           br(),
           fluidRow(
             column(4,div(align="center",
-              selectInput("modelClass",label = "Model Class", choices = c("Diffusion process", "Fractional process", "Compound Poisson", #"Levy process", 
+              selectInput("modelClass",label = "Model Class", choices = c("Diffusion process", "Fractional process", "Compound Poisson", "Levy process", 
                                                                           "CARMA", "COGARCH"), selected = "Diffusion process"),
               uiOutput("model"),
               uiOutput("jumps"),