Merge pull request #41 from africanmathsinitiative/master

Pulling changes from the main

instat/clsGridLink.vb

@@ -51,7 +51,7 @@ Public Class clsGridLink
             For i = 0 To lstDataNames.Length - 1
                 strDataName = lstDataNames.AsCharacter(i)
                 If (bGrdDataExists And frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$get_data_changed(data_name = " & Chr(34) & strDataName & Chr(34) & ")").AsLogical(0)) Then
-                    dfTemp = frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$get_data(" & Chr(34) & strDataName & Chr(34) & ")").AsDataFrame
+                    dfTemp = frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$get_data_frame(" & Chr(34) & strDataName & Chr(34) & ")").AsDataFrame
                     FillSheet(dfTemp, strDataName, grdData)
                     frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$set_data_frames_changed(" & Chr(34) & strDataName & Chr(34) & ", FALSE)")
                 End If

instat/clsRFunction.vb

@@ -69,7 +69,7 @@ Public Class RFunction
                     bToBeAssigned = False
                 Else
                     strScript = strScript & frmMain.clsRLink.strInstatDataObject & "$import_data(data_tables = list(" & strAssignToDataFrame & "=" & strAssignTo & "))" & vbCrLf
-                    strAssignTo = frmMain.clsRLink.strInstatDataObject & "$get_data(data_name = " & Chr(34) & strAssignToDataFrame & Chr(34) & ")"
+                    strAssignTo = frmMain.clsRLink.strInstatDataObject & "$get_data_frame(data_name = " & Chr(34) & strAssignToDataFrame & Chr(34) & ")"
                     bIsAssigned = True
                     bToBeAssigned = False
                 End If

instat/clsRLink.vb

@@ -63,26 +63,29 @@ Public Class RLink
         Dim i As Integer
 
         If bInstatObjectExists Then
-            lstCurrColumns = clsEngine.Evaluate(strInstatDataObject & "$get_column_names(" & Chr(34) & strDataFrame & Chr(34) & ")").AsList
-            If cboColumns IsNot Nothing Then
-                cboColumns.Items.Clear()
-                For i = 0 To lstCurrColumns.Length - 1
-                    cboColumns.Items.Add(lstCurrColumns.AsCharacter(i))
-                Next
-            ElseIf lstColumns IsNot Nothing Then
-                lstColumns.Items.Clear()
-                If lstColumns.Columns.Count = 0 Then
-                    lstColumns.Columns.Add("Available Data")
+            If clsEngine IsNot Nothing Then
+                lstCurrColumns = clsEngine.Evaluate(strInstatDataObject & "$get_column_names(" & Chr(34) & strDataFrame & Chr(34) & ")").AsList
+                If cboColumns IsNot Nothing Then
+                    cboColumns.Items.Clear()
+                    For i = 0 To lstCurrColumns.Length - 1
+                        cboColumns.Items.Add(lstCurrColumns.AsCharacter(i))
+                    Next
+                ElseIf lstColumns IsNot Nothing Then
+                    lstColumns.Items.Clear()
+                    If lstColumns.Columns.Count = 0 Then
+                        lstColumns.Columns.Add("Available Data")
+                    End If
+                    For i = 0 To lstCurrColumns.Length - 1
+                        lstColumns.Items.Add(lstCurrColumns.AsCharacter(i))
+                    Next
+                    lstColumns.Columns(0).Width = -2
                 End If
-                For i = 0 To lstCurrColumns.Length - 1
-                    lstColumns.Items.Add(lstCurrColumns.AsCharacter(i))
-                Next
-                lstColumns.Columns(0).Width = -2
             End If
         End If
+
     End Sub
 
-    Public Function GetDefaultNames(strPrefix As String)
+    Public Function GetDefaultColumnNames(strPrefix As String)
         Dim lstNextDefaults As GenericVector = Nothing
 
         If bInstatObjectExists Then
@@ -216,4 +219,11 @@ Public Class RLink
         End If
     End Sub
 
+    Public Function GetDataFrameLength(strDataFrameName As String) As Integer
+        Dim intLength As Integer
+        If clsEngine IsNot Nothing Then
+            intLength = clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$length_of_data(" & Chr(34) & strDataFrameName & Chr(34) & ")").AsInteger(0)
+        End If
+        Return intLength
+    End Function
 End Class

instat/clsRSyntax.vb

@@ -43,7 +43,7 @@ Public Class RSyntax
             clsRFunction = clsBaseFunction
         End If
         clsParam.SetArgumentName(strParameterName)
-        If Not strParameterName = "" Then
+        If Not strParameterValue = "" Then
             clsParam.SetArgumentValue(strParameterValue)
         End If
         If Not clsRFunctionParameter Is Nothing Then

instat/dlgBoxPlot.vb

@@ -30,11 +30,12 @@ Public Class dlgBoxplot
 
 
     Private Sub ucrReceiveBoxplotVariable_ValueChanged(sender As Object, e As EventArgs)
-        If Not (ucrReceiverDataToPlot.lstSelectedVariables.SelectedItem = "") Then
-            ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverDataToPlot.GetVariables())
-            ucrBase.OKEnabled(True)
-        Else
-            ucrBase.OKEnabled(False)
-        End If
+        'TODO fix this
+        'If Not (ucrReceiverDataToPlot.lstSelectedVariables.SelectedItem = "") Then
+        '    ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverDataToPlot.GetVariables())
+        '    ucrBase.OKEnabled(True)
+        'Else
+        '    ucrBase.OKEnabled(False)
+        'End If
     End Sub
 End Class

instat/dlgColumnStats.vb

@@ -27,7 +27,9 @@ Public Class dlgColumnStats
 
     Private Sub ucrReceiverMultiple_Leave(sender As Object, e As EventArgs) Handles ucrReceiverMultiple.Leave
         Dim objItem As Object
-        Dim temp_obj As ListBox.ObjectCollection = ucrReceiverMultiple.lstSelectedVariables.Items
+        'TODO fix this
+        Dim temp_obj As New Object
+        'Dim temp_obj As ListBox.ObjectCollection = ucrReceiverMultiple.lstSelectedVariables.Items
         If ucrReceiverMultiple.lstSelectedVariables.Items.Count > 0 Then
             For Each objItem In temp_obj
                 ucrBase.clsRsyntax.AddParameter("data_temp$" & objItem & "", "x")

instat/dlgCorrelation.vb

@@ -27,8 +27,9 @@ Public Class dlgCorrelation
 
     Private Sub ucrReceiverMultiple_Leave(sender As Object, e As EventArgs) Handles ucrReceiverMultiple.Leave
         If ucrReceiverMultiple.lstSelectedVariables.Items.Count = 2 Then
-            ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverMultiple.lstSelectedVariables.Items.Item(0) & "")
-            ucrBase.clsRsyntax.AddParameter("y", "data$" & ucrReceiverMultiple.lstSelectedVariables.Items.Item(1) & "")
+            'TODO fix this
+            'ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverMultiple.lstSelectedVariables.Items.Item(0) & "")
+            'ucrBase.clsRsyntax.AddParameter("y", "data$" & ucrReceiverMultiple.lstSelectedVariables.Items.Item(1) & "")
         End If
 
     End Sub

instat/dlgFreqTables.vb

@@ -43,6 +43,7 @@ Public Class dlgFreqTables
     End Sub
 
     Private Sub ucrReceiverMultiple_Leave(sender As Object, e As EventArgs) Handles ucrReceiverMultiple.Leave
-        ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverMultiple.lstSelectedVariables.SelectedItem & "")
+        'TODO fix this
+        'ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverMultiple.lstSelectedVariables.SelectedItem & "")
     End Sub
 End Class

instat/dlgRandomSample.vb

@@ -24,11 +24,11 @@ Public Class dlgRandomSample
         ' Setting distribution type and base function as distribution function
         ucrDistWithParameters.SetRDistributions()
         ucrBase.clsRsyntax.clsBaseFunction = ucrDistWithParameters.clsCurrRFunction
-        ucrDistWithParameters.AddParameter("n", ucrDataFrameSelector.strDataFrameLength)
+        ucrDistWithParameters.AddParameter("n", ucrDataFrameSelector.iDataFrameLength)
 
         ' Setting link between DataFrameSelector and NewColumnNameSelector
         ' TODO tidy these links up
-        ucrDataFrameSelector.SetColumnList(ucrNewColumnNameSelector)
+        'ucrDataFrameSelector.SetColumnList(ucrNewColumnNameSelector)
         ucrNewColumnNameSelector.SetDataFrameSelector(ucrDataFrameSelector)
         ucrNewColumnNameSelector.SetPrefix("Rand")
 
@@ -38,7 +38,7 @@ Public Class dlgRandomSample
     End Sub
 
     Private Sub ucrDataFrameSelector_Leave(sender As Object, e As EventArgs) Handles ucrDataFrameSelector.Leave
-        ucrDistWithParameters.AddParameter("n", ucrDataFrameSelector.strDataFrameLength)
+        ucrDistWithParameters.AddParameter("n", ucrDataFrameSelector.iDataFrameLength)
     End Sub
 
     Private Sub ucrNewColumnNameSelector_Leave(sender As Object, e As EventArgs) Handles ucrNewColumnNameSelector.Leave

instat/dlgRegularSequence.vb

@@ -23,7 +23,7 @@ Public Class dlgRegularSequence
         frmMain.clsRLink.SetOutput(txtGetPreview)
         dtpSelectorA.Visible = False
         dtpSelectorB.Visible = False
-        ucrSelectDataFrame.SetColumnList(ucrColName)
+        'ucrSelectDataFrame.SetColumnList(ucrColName)
 
         ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrColName.cboColumnName.Text, strTempDataframe:=ucrSelectDataFrame.cboAvailableDataFrames.Text, strTempColumn:=ucrColName.cboColumnName.Text)
     End Sub