Merge pull request IDEMSInternational#5091 from dannyparsons/Muthenya…

…-GeneralModels Muthenya general models
Wycklife · Nov 4, 2018 · eead410 · eead410
2 parents be38008 + df12818
commit eead410
Show file tree

Hide file tree

Showing 8 changed files with 1,501 additions and 840 deletions.
diff --git a/instat/clsRSyntax.vb b/instat/clsRSyntax.vb
@@ -467,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

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