Merge pull request #6 from africanmathsinitiative/master

new version
stevekogo · Oct 13, 2016 · ed67c90 · ed67c90
2 parents 9a5e0de + 2240b7c
commit ed67c90
Show file tree

Hide file tree

Showing 22 changed files with 409 additions and 111 deletions.
diff --git a/instat/My Project/Resources.Designer.vb b/instat/My Project/Resources.Designer.vb
diff --git a/instat/My Project/Resources.resx b/instat/My Project/Resources.resx
@@ -1513,4 +1513,13 @@
   <data name="Location" xml:space="preserve">
     <value>Location</value>
   </data>
+  <data name="Beta" xml:space="preserve">
+    <value>Beta</value>
+  </data>
+  <data name="Negative_Binomial" xml:space="preserve">
+    <value>Negative Binomial</value>
+  </data>
+  <data name="Students_t" xml:space="preserve">
+    <value>Students t</value>
+  </data>
 </root>
diff --git a/instat/dlgMakeDate.vb b/instat/dlgMakeDate.vb
@@ -18,16 +18,16 @@ Imports instat.Translations
 Public Class dlgMakeDate
     Public clsPaste As New RFunction
     Public bFirstLoad As Boolean = True
-    Private Sub ucrSeclectorMakeDate_Load(sender As Object, e As EventArgs) Handles ucrSeclectorMakeDate.Load
+    Private Sub dlgMakeDate_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         If bFirstLoad Then
-            InitialiseDialog()
+            InitialiseDialog()
             SetDefaults()
-            bFirstLoad = False
-        Else
-            ReopenDialog()
-        End If
-        TestOKEnabled()
-        autoTranslate(Me)
+            bFirstLoad = False
+        Else
+            ReopenDialog()
+        End If
+        TestOKEnabled()
+        autoTranslate(Me)
 
     End Sub
 
@@ -46,7 +46,7 @@ Public Class dlgMakeDate
         ucrInputComboBoxTearThree.SetItems({"4 digits", "2 digits"})
         ucrInputOrigin.SetItems({"30-12-1899 (Excel)", "01-03-1600 (Gregorian)"})
 
-        ucrBase.clsRsyntax.SetFunction("as.Date")
+        ucrBase.clsRsyntax.SetFunction("as.Date")
         ucrBase.clsRsyntax.AddParameter("x")
 
     End Sub
@@ -79,8 +79,20 @@ Public Class dlgMakeDate
             ucrBase.OKEnabled(False)
         End If
     End Sub
+    Private Sub DateFormat()
+        Select Case ucrInputOrigin.GetText
+            Case "30-12-1899 (Excel)"
+                ucrBase.clsRsyntax.AddParameter("origin", Chr(34) & "1899-12-30" & Chr(34))
+            Case Else
+                ucrBase.clsRsyntax.AddParameter("origin", Chr(34) & "1600-01-03" & Chr(34))
+        End Select
+    End Sub
 
     Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk
+        setHistory()
+    End Sub
+
+    Private Sub setHistory()
         If Not ucrInputFormat.cboInput.Items.Contains(ucrInputFormat.GetText) Then
             ucrInputFormat.cboInput.Items.Insert(0, ucrInputFormat.GetText)
         Else
@@ -124,10 +136,6 @@ Public Class dlgMakeDate
         End If
     End Sub
 
-    Private Sub ucrReceiverForDate_Load(sender As Object, e As EventArgs)
-
-    End Sub
-
     Private Sub rdoSingleColumn_CheckedChanged(sender As Object, e As EventArgs) Handles rdoSingleColumn.CheckedChanged, rdoYearandDayofYear.CheckedChanged, rdoYearMonthDay.CheckedChanged
         ShowGroups()
     End Sub
@@ -186,26 +194,24 @@ Public Class dlgMakeDate
         Formats()
     End Sub
 
-    Private Sub ucrSeclectorMakeDate_DataFrameChanged() Handles ucrSeclectorMakeDate.DataFrameChanged
-
-    End Sub
-
-
     Private Sub ucrInputOrigin_NameChanged() Handles ucrInputOrigin.NameChanged
         Formats()
+        If Not ucrInputOrigin.IsEmpty Then
+            DateFormat()
+        Else
+            ucrBase.clsRsyntax.RemoveParameter("origin")
+        End If
+
     End Sub
 
     Private Sub Formats()
         If rdoSpecifyOrigin.Checked Then
+            ucrReceiverForDate.SetIncludedDataTypes({"numeric"})
             ucrInputFormat.Visible = False
             ucrBase.clsRsyntax.RemoveParameter("format")
-            If Not ucrInputOrigin.IsEmpty Then
-                ucrBase.clsRsyntax.AddParameter("origin", Chr(34) & ucrInputOrigin.GetText & Chr(34))
-            Else
-                ucrBase.clsRsyntax.RemoveParameter("origin")
 
-            End If
         ElseIf rdoSpecifyFormat.Checked Then
+            ucrReceiverForDate.SetIncludedDataTypes({"numeric", "character", "factor", "integer"})
             ucrBase.clsRsyntax.RemoveParameter("origin")
             ucrInputFormat.Visible = True
             If Not ucrInputFormat.IsEmpty Then
@@ -215,6 +221,7 @@ Public Class dlgMakeDate
             End If
         Else
             ucrInputFormat.Visible = False
+            ucrReceiverForDate.SetIncludedDataTypes({"numeric", "character", "factor", "integer"})
             ucrBase.clsRsyntax.RemoveParameter("format")
             ucrBase.clsRsyntax.RemoveParameter("origin")
         End If

diff --git a/instat/dlgOneVarFitModel.vb b/instat/dlgOneVarFitModel.vb
@@ -121,9 +121,9 @@ Public Class dlgOneVarFitModel
 
     Private Sub chkSaveModel_CheckedChanged(sender As Object, e As EventArgs) Handles chkSaveModel.CheckedChanged
         If chkSaveModel.Checked Then
-            ucrSaveModel.Enabled = True
+            ucrSaveModel.Visible = True
         Else
-            ucrSaveModel.Enabled = False
+            ucrSaveModel.Visible = False
         End If
         AssignSaveModel()
         TestOKEnabled()
@@ -171,6 +171,9 @@ Public Class dlgOneVarFitModel
         If sdgOneVarFitModel.rdoMle.Checked AndAlso (sdgOneVarFitModDisplay.rdoLoglik.Checked Or sdgOneVarFitModDisplay.rdoLik.Checked) Then
             sdgOneVarFitModDisplay.RunLikelihoods()
         End If
+        '  If Not sdgOneVarFitModel.rdoMle.Checked AndAlso (sdgOneVarFitModDisplay.rdoLoglik.Checked Or sdgOneVarFitModDisplay.rdoLik.Checked) Then
+        'message to say likelihood won't be displayed
+        ' End If
     End Sub
 
 End Class
diff --git a/instat/dlgOneVarUseModel.vb b/instat/dlgOneVarUseModel.vb
@@ -93,7 +93,7 @@ Public Class dlgOneVarUseModel
     End Sub
 
     Private Sub ucrSelector_DataFrameChanged() Handles ucrSelector.DataFrameChanged
-        ' AssignSaveModel()
+        AssignSavetoDataFrame()
         ' AssignSaveObjects()
     End Sub
 

diff --git a/instat/dlgOneVariableGraph.vb b/instat/dlgOneVariableGraph.vb
@@ -175,4 +175,4 @@ Public Class dlgOneVariableGraph
             rdoCombineGraph.Enabled = False
         End If
     End Sub
-End Class
+End Class
diff --git a/instat/frmMain.vb b/instat/frmMain.vb
@@ -1171,8 +1171,4 @@ Public Class frmMain
     Private Sub mnuOrganiseColumnMakeDate_Click(sender As Object, e As EventArgs) Handles mnuOrganiseColumnMakeDate.Click
         dlgMakeDate.ShowDialog()
     End Sub
-
-    Private Sub mnuOrganiseColumnMakeDate_Click_1(sender As Object, e As EventArgs) Handles mnuOrganiseColumnMakeDate.Click
-        dlgMakeDate.ShowDialog()
-    End Sub
 End Class
diff --git a/instat/instat.vbproj b/instat/instat.vbproj
@@ -254,6 +254,12 @@
     <Compile Include="sdgDescribeTwoVarGraph.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="sdgFactorDataFrame.Designer.vb">
+      <DependentUpon>sdgFactorDataFrame.vb</DependentUpon>
+    </Compile>
+    <Compile Include="sdgFactorDataFrame.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="sdgMerge.Designer.vb">
       <DependentUpon>sdgMerge.vb</DependentUpon>
     </Compile>
@@ -2763,6 +2769,9 @@
     <EmbeddedResource Include="sdgDescribeTwoVarGraph.sw-KE.resx">
       <DependentUpon>sdgDescribeTwoVarGraph.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="sdgFactorDataFrame.resx">
+      <DependentUpon>sdgFactorDataFrame.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="sdgMerge.fr-FR.resx">
       <DependentUpon>sdgMerge.vb</DependentUpon>
     </EmbeddedResource>

diff --git a/instat/sdgFactorDataFrame.Designer.vb b/instat/sdgFactorDataFrame.Designer.vb