Merge pull request #95 from lilyclements/AlexOneVarUse

Alex one var use
IDEMSInternational · May 26, 2017 · 17385fb · 17385fb
2 parents 3be7bee + b928ad5
commit 17385fb
Show file tree

Hide file tree

Showing 4 changed files with 302 additions and 319 deletions.
diff --git a/instat/dlgOneVarUseModel.Designer.vb b/instat/dlgOneVarUseModel.Designer.vb
diff --git a/instat/dlgOneVarUseModel.vb b/instat/dlgOneVarUseModel.vb
@@ -82,20 +82,19 @@ Public Class dlgOneVarUseModel
         sdgOneVarUseModFit.SetDefaults()
 
         clsSeqFunction.SetRCommand("seq")
-        clsSeqFunction.AddParameter("from", 0)
+        clsSeqFunction.AddParameter("from", 0) ' TODO: these parameters have default values set earlier, are these needed here?
         clsSeqFunction.AddParameter("to", 1)
-        clsSeqFunction.AddParameter("by", 0.1)
+        clsSeqFunction.AddParameter("by", 0.25)
 
         clsQuantileFunction.SetRCommand("quantile")
         clsQuantileFunction.AddParameter("probs", clsRFunctionParameter:=clsSeqFunction)
-        clsQuantileFunction.AddParameter("CI.level", 0.95)
+        'clsQuantileFunction.AddParameter("CI.level", 0.95) ' this should only be added if bootstrap is checked
 
         clsRBootFunction.SetPackageName("fitdistrplus")
         clsRBootFunction.SetRCommand("bootdist")
         clsRBootFunction.AddParameter("bootmethod", Chr(34) & "nonparam" & Chr(34))
         clsRBootFunction.AddParameter("niter", 1001)
 
-
         ucrBase.clsRsyntax.SetBaseRFunction(clsQuantileFunction)
 
         ucrBase.clsRsyntax.SetAssignTo(ucrNewDataFrameName.GetText, strTempModel:="last_model", strTempDataframe:=ucrSelectorUseModel.ucrAvailableDataFrames.cboAvailableDataFrames.Text)
@@ -143,8 +142,13 @@ Public Class dlgOneVarUseModel
     'End If
     'End Sub
 
-
-
+    Public Sub QuantileCommand()
+        If sdgOneVarUseModFit.rdoSequence.Checked Then
+            clsQuantileFunction.AddParameter("probs", clsRFunctionParameter:=clsSeqFunction)
+        Else
+            clsQuantileFunction.AddParameter("probs", strParameterValue:="c(" & sdgOneVarUseModFit.ucrInputQuantiles.GetText & ")")
+        End If
+    End Sub
 
     Private Sub cmdFitModel_Click(sender As Object, e As EventArgs) Handles cmdFitModelandBootstrap.Click
         sdgOneVarUseModFit.SetRFunction(clsSeqFunction, clsRBootFunction, clsQuantileFunction, bResetSubdialog)