Merge pull request #43 from africanmathsinitiative/master

merge from master copy
IDEMSInternational · Oct 25, 2016 · 34cfabe · 34cfabe
2 parents b652df3 + a2ce1be
commit 34cfabe
Show file tree

Hide file tree

Showing 8 changed files with 896 additions and 338 deletions.
diff --git a/instat/dlgCorrelation.designer.vb b/instat/dlgCorrelation.designer.vb
diff --git a/instat/dlgCorrelation.vb b/instat/dlgCorrelation.vb
@@ -31,15 +31,18 @@ Public Class dlgCorrelation
     End Sub
 
     Private Sub InitialiseDialog()
-        ucrReceiverFirstColumn.Selector = ucrSelectorDataFrameVarAddRemove
-        ucrReceiverSecondColumn.Selector = ucrSelectorDataFrameVarAddRemove
-        ucrReceiverMultipleColumns.Selector = ucrSelectorDataFrameVarAddRemove
+        ucrReceiverFirstColumn.Selector = ucrSelectorCorrelation
+        ucrReceiverSecondColumn.Selector = ucrSelectorCorrelation
+        ucrReceiverMultipleColumns.Selector = ucrSelectorCorrelation
         ucrReceiverFirstColumn.SetDataType("numeric")
         ucrReceiverSecondColumn.SetDataType("numeric")
-        ucrSelectorDataFrameVarAddRemove.Reset()
-        ucrSelectorDataFrameVarAddRemove.Focus()
+        ucrSelectorCorrelation.Reset()
+        ucrSelectorCorrelation.Focus()
         ucrReceiverMultipleColumns.SetSingleTypeStatus(True)
         ucrReceiverMultipleColumns.SetDataType("numeric")
+        nudConfidenceInterval.Minimum = 0
+        nudConfidenceInterval.Maximum = 1
+        nudConfidenceInterval.Increment = 0.05
         ucrBase.iHelpTopicID = 186
     End Sub
 
@@ -49,8 +52,12 @@ Public Class dlgCorrelation
 
     Private Sub SetDefaults()
         rdoPearson.Checked = True
+        rdoCompleteRowsOnly.Checked = True
         rdoMultipleColumns.Checked = True
+        ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
+        nudConfidenceInterval.Value = 0.95
         sdgCorrPlot.SetDefaults()
+        ucrSelectorCorrelation.Reset()
         ucrReceiverMultipleColumns.SetMeAsReceiver()
         TestOKEnabled()
     End Sub

diff --git a/instat/dlgPrincipalComponentAnalysis.Designer.vb b/instat/dlgPrincipalComponentAnalysis.Designer.vb
diff --git a/instat/dlgPrincipalComponentAnalysis.vb b/instat/dlgPrincipalComponentAnalysis.vb
@@ -35,9 +35,11 @@ Public Class dlgPrincipalComponentAnalysis
         ucrBasePCA.clsRsyntax.SetFunction("PCA")
         ucrBasePCA.clsRsyntax.iCallType = 0
         ucrReceiverMultiplePCA.Selector = ucrSelectorPCA
-        ucrReceiverMultiplePCA.SetDataType("numeric")
+        ucrReceiverMultiplePCA.SetDataType("numeric") ' this isn't working
         ucrResultName.SetDefaultTypeAsModel()
-
+        ucrResultName.SetItemsTypeAsModels()
+        ucrResultName.SetValidationTypeAsRVariable()
+        ucrBasePCA.clsRsyntax.bExcludeAssignedFunctionOutput = False
         ucrBasePCA.iHelpTopicID = 187
     End Sub
 
@@ -55,16 +57,22 @@ Public Class dlgPrincipalComponentAnalysis
         ucrBasePCA.clsRsyntax.AddParameter("graph", "FALSE")
         ucrResultName.SetName("PCA")
         sdgPrincipalComponentAnalysis.SetDefaults()
+        ComponentsMinimum()
         TestOKEnabled()
     End Sub
 
     Private Sub TestOKEnabled()
         'If (Not ucrReceiverMultiplePCA.IsEmpty()) And ucrReceiverMultiplePCA.lstSelectedVariables.Items.Count > 1 Then
-        If (Not ucrReceiverMultiplePCA.IsEmpty()) Then
-            ucrBasePCA.OKEnabled(True)
-            AssignName()
-        Else
-            ucrBasePCA.OKEnabled(False)
+        'If Not ucrReceiverMultiplePCA.IsEmpty() AndAlso ((chkSaveResult.Checked AndAlso ucrResultName.GetText() <> "") OrElse Not chkSaveResult.Checked) Then
+        'ucrBasePCA.OKEnabled(True)
+        'Else
+        ' ucrBasePCA.OKEnabled(False)
+        'End If
+
+        If (chkSaveResult.Checked AndAlso Not ucrResultName.IsEmpty() OrElse Not chkSaveResult.Checked) AndAlso Not ucrReceiverMultiplePCA.IsEmpty() Then
+            ucrBasePCA.OKEnabled(True)
+        Else
+            ucrBasePCA.OKEnabled(False)
         End If
     End Sub
 
@@ -77,18 +85,19 @@ Public Class dlgPrincipalComponentAnalysis
     End Sub
 
     Public Sub ucrReceiverMultiplePCA_SelectionChanged() Handles ucrReceiverMultiplePCA.SelectionChanged
-        TestOKEnabled()
-        If ucrReceiverMultiplePCA.lstSelectedVariables.Items.Count > 5 Then
-            nudComponents.Value = 5
-        Else
-            nudComponents.Value = ucrReceiverMultiplePCA.lstSelectedVariables.Items.Count
+        If ucrReceiverMultiplePCA.IsEmpty Then
+            AssignName()
         End If
         ucrBasePCA.clsRsyntax.AddParameter("X", clsRFunctionParameter:=ucrReceiverMultiplePCA.GetVariables())
         ucrBasePCA.clsRsyntax.AddParameter("ncp", nudComponents.Value)
+        sdgPrincipalComponentAnalysis.Dimensions()
+        TestOKEnabled()
+        ComponentsMinimum()
     End Sub
 
     Private Sub nudComponents_TextChanged(sender As Object, e As EventArgs) Handles nudComponents.TextChanged
         ucrBasePCA.clsRsyntax.AddParameter("ncp", nudComponents.Value)
+        sdgPrincipalComponentAnalysis.Dimensions()
     End Sub
 
     Private Sub chkScaleData_CheckedChanged(sender As Object, e As EventArgs) Handles chkScaleData.CheckedChanged
@@ -103,7 +112,7 @@ Public Class dlgPrincipalComponentAnalysis
         sdgPrincipalComponentAnalysis.ShowDialog()
     End Sub
 
-    Private Sub ucrResultName_NameChanged()
+    Private Sub ucrResultName_NameChanged() Handles ucrResultName.NameChanged
         AssignName()
     End Sub
 
@@ -127,9 +136,26 @@ Public Class dlgPrincipalComponentAnalysis
             ucrBasePCA.clsRsyntax.bExcludeAssignedFunctionOutput = False
             strModelName = "last_PCA"
         End If
+        TestOKEnabled()
     End Sub
 
     Private Sub ucrBasePCA_clickok(sender As Object, e As EventArgs) Handles ucrBasePCA.ClickOk
         sdgPrincipalComponentAnalysis.PCAOptions()
     End Sub
+
+    Private Sub ComponentsMinimum()
+        If ucrReceiverMultiplePCA.IsEmpty Then
+            nudComponents.Minimum = 0
+            nudComponents.Value = 0
+        ElseIf ucrReceiverMultiplePCA.lstSelectedVariables.Items.Count = 1 Then
+            nudComponents.Minimum = 2
+        ElseIf ucrReceiverMultiplePCA.lstSelectedVariables.Items.Count > 1 Then
+            nudComponents.Minimum = 2
+            If ucrReceiverMultiplePCA.lstSelectedVariables.Items.Count > 5 Then
+                nudComponents.Value = 5
+            Else
+                nudComponents.Value = ucrReceiverMultiplePCA.lstSelectedVariables.Items.Count
+            End If
+        End If
+    End Sub
 End Class