Skip to content

Commit

Permalink
Merge pull request #100 from africanmathsinitiative/master
Browse files Browse the repository at this point in the history
Updating my master
  • Loading branch information
conlooptechnologies authored Nov 5, 2018
2 parents 117683c + eead410 commit 0833a92
Show file tree
Hide file tree
Showing 24 changed files with 3,127 additions and 1,862 deletions.
7 changes: 4 additions & 3 deletions instat/clsRSyntax.vb
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ Public Class RSyntax
Dim lstScripts As New List(Of String)

For Each clsTempCode In lstCodes
strScript = ""
strTemp = clsTempCode.ToScript(strScript)
'Sometimes the output of the R-command we deal with should not be part of the script... That's only the case when this output has already been assigned.
If clsTempCode.bExcludeAssignedFunctionOutput AndAlso clsTempCode.bIsAssigned Then
Expand Down Expand Up @@ -466,9 +467,9 @@ Public Class RSyntax
Public Sub ClearCodes()
lstBeforeCodes = New List(Of RCodeStructure)
lstAfterCodes = New List(Of RCodeStructure)
clsBaseFunction = Nothing
clsBaseOperator = Nothing
clsBaseCommandString = Nothing
clsBaseFunction = New RFunction
clsBaseOperator = New ROperator
clsBaseCommandString = New RCodeStructure
strCommandString = ""
bUseBaseFunction = False
bUseBaseOperator = False
Expand Down
1 change: 1 addition & 0 deletions instat/clsRegressionDefaults.vb
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ Public Class clsRegressionDefaults
Dim clsAutoplot As New RFunction
Dim clsWhichFuntion As New RFunction

clsAutoplot.SetPackageName("ggplot2")
clsAutoplot.SetRCommand("autoplot")
clsAutoplot.iCallType = 3
clsWhichFuntion.SetRCommand("c")
Expand Down
19 changes: 19 additions & 0 deletions instat/dlgExportToCPT.Designer.vb

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

Loading

0 comments on commit 0833a92

Please sign in to comment.