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

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

Author: phoenix844
Date: 2016-11-15 01:27:16 +0100 (Tue, 15 Nov 2016)
New Revision: 520

Added:
   pkg/yuimaGUI/inst/yuimaGUI/www/oviedo2016.png
Modified:
   pkg/yuimaGUI/DESCRIPTION
   pkg/yuimaGUI/inst/yuimaGUI/global.R
   pkg/yuimaGUI/inst/yuimaGUI/server.R
   pkg/yuimaGUI/inst/yuimaGUI/ui.R
   pkg/yuimaGUI/inst/yuimaGUI/www/custom.css
Log:
added diagnostic.carma + compstat icon

Modified: pkg/yuimaGUI/DESCRIPTION
===================================================================
--- pkg/yuimaGUI/DESCRIPTION	2016-11-14 15:02:40 UTC (rev 519)
+++ pkg/yuimaGUI/DESCRIPTION	2016-11-15 00:27:16 UTC (rev 520)
@@ -1,7 +1,7 @@
 Package: yuimaGUI
 Type: Package 
 Title: A Graphical User Interface for the Yuima Package
-Version: 0.7.9
+Version: 0.7.10
 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	2016-11-14 15:02:40 UTC (rev 519)
+++ pkg/yuimaGUI/inst/yuimaGUI/global.R	2016-11-15 00:27:16 UTC (rev 520)
@@ -567,12 +567,12 @@
     else if(test$stationary==FALSE | test$positivity==FALSE) createAlert(session = session, anchorId = anchorId, alertId = alertId, content = paste("The estimated model does not satisfy theoretical properties.", temp$msg), style = "warning")
     else createAlert(session = session, anchorId = anchorId, alertId = alertId, content = paste(msg, temp$msg), style = style)
   } 
-  # else if (yuimaGUI$info$class=="CARMA") {
-  #   test <- try(Diagnostic.Carma(yuimaGUI$qmle))
-  #   if (class(test)=="try-error") createAlert(session = session, anchorId = anchorId, alertId = alertId, content = paste("The estimated model does not satisfy theoretical properties.", temp$msg), style = "warning")
-  #   else if(test==FALSE) createAlert(session = session, anchorId = anchorId, alertId = alertId, content = paste("The estimated model does not satisfy theoretical properties.", temp$msg), style = "warning")
-  #   else createAlert(session = session, anchorId = anchorId, alertId = alertId, content = paste(msg, temp$msg), style = style)
-  # } 
+  else if (yuimaGUI$info$class=="CARMA") {
+    test <- try(Diagnostic.Carma(yuimaGUI$qmle))
+    if (class(test)=="try-error") createAlert(session = session, anchorId = anchorId, alertId = alertId, content = paste("The estimated model does not satisfy theoretical properties.", temp$msg), style = "warning")
+    else if(test==FALSE) createAlert(session = session, anchorId = anchorId, alertId = alertId, content = paste("The estimated model does not satisfy theoretical properties.", temp$msg), style = "warning")
+    else createAlert(session = session, anchorId = anchorId, alertId = alertId, content = paste(msg, temp$msg), style = style)
+  }
   else if (!is.null(temp$msg) | !is.null(msg)) createAlert(session = session, anchorId = anchorId, alertId = alertId, content = paste(msg, temp$msg), style = style)
   return(outputTable)
 }

Modified: pkg/yuimaGUI/inst/yuimaGUI/server.R
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/server.R	2016-11-14 15:02:40 UTC (rev 519)
+++ pkg/yuimaGUI/inst/yuimaGUI/server.R	2016-11-15 00:27:16 UTC (rev 520)
@@ -38,7 +38,15 @@
     HTML('<iframe width="90%" height="250px" src="//www.youtube.com/embed/XX_bmCrI_gc" frameborder="0" allowfullscreen></iframe>')
   })
   
+  output$certificates <- renderUI({
+    div(align = "center",
+      HTML('<a href="http://cmstatistics.org/RegistrationsV2/COMPSTAT2016/viewSubmission.php?in=503&token=35qqr5sq3n5850n698190opn67p36q05">
+              <img src="oviedo2016.png" class="thumbnail" height="100" width="100" />
+           </a>')
+    )
+  })
   
+  
   ########################Load Economic and Financial Data
   ########################
   ########################

Modified: pkg/yuimaGUI/inst/yuimaGUI/ui.R
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/ui.R	2016-11-14 15:02:40 UTC (rev 519)
+++ pkg/yuimaGUI/inst/yuimaGUI/ui.R	2016-11-15 00:27:16 UTC (rev 520)
@@ -50,7 +50,7 @@
              "Once data are loaded, you can go and use sections 'Explorative Data Analysis' and 'Modeling'.", style="color:#CDCECD; font-family: Times New Roman, Georgia, Serif;"),
           h4("Step 2", style="color:#edeeed"),
           h4("Model your data in section 'Modeling'.", br(),
-             "Here you can fit models to your data choosing between some default options but also defining and using your own model.", br(),
+             "Here you can fit models to your data choosing between some default options or defining and using your own model.", br(),
              "Now you are ready to use the estimated models for simulation purposes in section 'Simulate'.", style="color:#CDCECD; font-family: Times New Roman, Georgia, Serif;"),
           h4("Step 3", style="color:#edeeed"),
           h4("Read the short explanation at the beginning of every (sub)section.", style="color:#CDCECD; font-family: Times New Roman, Georgia, Serif;")
@@ -61,7 +61,9 @@
         )
       ),
       fluidRow(
-        column(8),
+        column(8, br(),
+          uiOutput("certificates")       
+        ),
         column(4,
           h3(em("Developed by"), style="color:#edeeed", align = "center"),
           h4("Emanuele Guidotti", style="color:#CDCECD; font-family: Times New Roman, Georgia, Serif;", align = "center"),

Modified: pkg/yuimaGUI/inst/yuimaGUI/www/custom.css
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/www/custom.css	2016-11-14 15:02:40 UTC (rev 519)
+++ pkg/yuimaGUI/inst/yuimaGUI/www/custom.css	2016-11-15 00:27:16 UTC (rev 520)
@@ -11,6 +11,14 @@
 .content-wrapper, .right-side {
                               background-color:  #282828;
                               }
+                              
+                    
+.thumbnail:hover {
+    width:250px;
+    height:auto;
+    margin-top: -100px;
+}
+
 tr{
   background-color: #dddcdc;
   color: black;

Added: pkg/yuimaGUI/inst/yuimaGUI/www/oviedo2016.png
===================================================================
(Binary files differ)


Property changes on: pkg/yuimaGUI/inst/yuimaGUI/www/oviedo2016.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream