Skip to content

Commit

Permalink
Merge pull request #5 from africanmathsinitiative/master
Browse files Browse the repository at this point in the history
updating my repo
  • Loading branch information
nyagishira committed May 11, 2016
2 parents cd57566 + f521da0 commit ee5fb44
Show file tree
Hide file tree
Showing 8 changed files with 213 additions and 118 deletions.
2 changes: 0 additions & 2 deletions instat/clsGridLink.vb
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,6 @@ Public Class clsGridLink
fillWorkSheet.ColumnHeaders(k).Text = dfTemp.ColumnNames(k) & " (c)"
Case "Date"
fillWorkSheet.ColumnHeaders(k).Text = dfTemp.ColumnNames(k) & " (D)"
Case "logical"
fillWorkSheet.ColumnHeaders(k).Text = dfTemp.ColumnNames(k) & " (l)"
Case Else
fillWorkSheet.ColumnHeaders(k).Text = dfTemp.ColumnNames(k)
End Select
Expand Down
2 changes: 1 addition & 1 deletion instat/clsRLink.vb
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ Public Class RLink
Public Function GetDataFrameLength(strDataFrameName As String) As Integer
Dim intLength As Integer
If clsEngine IsNot Nothing Then
intLength = clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$get_dataframe_length(" & Chr(34) & strDataFrameName & Chr(34) & ")").AsInteger(0)
intLength = clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$get_data_frame_length(" & Chr(34) & strDataFrameName & Chr(34) & ")").AsInteger(0)
End If
Return intLength
End Function
Expand Down
24 changes: 13 additions & 11 deletions instat/dlgPermuteColumn.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions instat/dlgPolynomials.vb
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ Public Class dlgPolynomials
Private Sub SetDefaults()
ucrInputPolynomial.SetPrefix("Poly")
rdoSimple.Checked = True
rdoCentered.Checked = False
rdoOrthogonal.Checked = False
XParameter()
nudDegree.Value = 2
ucrSelectorForPolynomial.Reset()
ucrSelectorForPolynomial.Focus()
Expand Down Expand Up @@ -91,6 +90,10 @@ Public Class dlgPolynomials
End Sub

Private Sub grpType_CheckedChanged(sender As Object, e As EventArgs) Handles rdoSimple.CheckedChanged, rdoCentered.CheckedChanged, rdoOrthogonal.CheckedChanged
XParameter()
End Sub

Private Sub XParameter()
If rdoSimple.Checked Then
ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverPolynomial.GetVariables())
ucrBase.clsRsyntax.AddParameter("raw", "TRUE")
Expand All @@ -105,10 +108,8 @@ Public Class dlgPolynomials

Else
ucrBase.clsRsyntax.RemoveParameter("raw")

End If
End Sub

Private Sub nudDegree_TextChanged(sender As Object, e As EventArgs) Handles nudDegree.TextChanged
ucrBase.clsRsyntax.AddParameter("degree", nudDegree.Value)
TestOKEnabled()
Expand Down
87 changes: 42 additions & 45 deletions instat/frmEditor.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ee5fb44

Please sign in to comment.