Merge pull request #91 from africanmathsinitiative/master

updating branch

instat/Model/DataFrame/clsDataFramePage.vb

@@ -261,11 +261,15 @@ Public Class clsDataFramePage
             columnHeader.bIsFactor = True
         ElseIf strHeaderType.Contains("character") Then
             columnHeader.strTypeShortCode = "(C)"
-        ElseIf strHeaderType.Contains("Date") OrElse strHeaderType.Contains("POSIXct") OrElse
-                strHeaderType.Contains("POSIXt") OrElse strHeaderType.Contains("hms") OrElse
-                strHeaderType.Contains("difftime") OrElse strHeaderType.Contains("Duration") OrElse
+        ElseIf strHeaderType.Contains("Date") OrElse strHeaderType.Contains("Duration") OrElse
                 strHeaderType.Contains("Period") OrElse strHeaderType.Contains("Interval") Then
             columnHeader.strTypeShortCode = "(D)"
+        ElseIf strHeaderType.Contains("POSIXct") OrElse
+                strHeaderType.Contains("POSIXt") Then
+            columnHeader.strTypeShortCode = "(D.T)"
+        ElseIf strHeaderType.Contains("hms") OrElse
+                strHeaderType.Contains("difftime") Then
+            columnHeader.strTypeShortCode = "(T)"
         ElseIf strHeaderType.Contains("logical") Then
             columnHeader.strTypeShortCode = "(L)"
             ' Structured columns e.g. "circular" are coded with "(S)"

instat/clsInstatOptions.vb

@@ -72,7 +72,7 @@ Imports RDotNet
         iPreviewRows = clsInstatOptionsDefaults.DEFAULTiPreviewRows
         iMaxRows = clsInstatOptionsDefaults.DEFAULTiMaxRows
         iMaxCols = clsInstatOptionsDefaults.DEFAULTiMaxCols
-        strComment = clsInstatOptionsDefaults.DEFAULTstrComment
+        strComment = Translations.GetTranslation(clsInstatOptionsDefaults.DEFAULTstrComment)
         strGraphDisplayOption = clsInstatOptionsDefaults.DEFAULTstrGraphDisplayOption
         strLanguageCultureCode = clsInstatOptionsDefaults.DEFAULTstrLanguageCultureCode
         strWorkingDirectory = clsInstatOptionsDefaults.DEFAULTstrWorkingDirectory
@@ -143,10 +143,8 @@ Imports RDotNet
             SetCommandInOutpt(clsInstatOptionsDefaults.DEFAULTbCommandsinOutput)
         End If
 
-        If strComment IsNot Nothing Then
-            SetComment(strComment)
-        Else
-            SetComment(clsInstatOptionsDefaults.DEFAULTstrComment)
+        If strComment Is Nothing Then
+            SetComment(Translations.GetTranslation(clsInstatOptionsDefaults.DEFAULTstrComment))
         End If
 
         If strGraphDisplayOption IsNot Nothing Then

instat/clsRegressionDefaults.vb

@@ -25,6 +25,38 @@ Public Class clsRegressionDefaults
         End Get
     End Property
 
+    Public Shared ReadOnly Property clsDefaultGLmNBFunction As RFunction
+        Get
+
+            Dim clsNegativeBinomialFunction As New RFunction
+
+            clsNegativeBinomialFunction.SetRCommand("glm.nb")
+            clsNegativeBinomialFunction.SetPackageName("MASS")
+            Return clsNegativeBinomialFunction
+        End Get
+    End Property
+
+    Public Shared ReadOnly Property clsDefaultGLmPolrFunction As RFunction
+        Get
+
+            Dim clsRModelFunction As New RFunction
+
+            clsRModelFunction.SetRCommand("polr")
+            clsRModelFunction.SetPackageName("MASS")
+            Return clsRModelFunction
+        End Get
+    End Property
+
+    Public Shared ReadOnly Property clsDefaultGLmMultinomFunction As RFunction
+        Get
+
+            Dim clsMultinomFunction As New RFunction
+
+            clsMultinomFunction.SetRCommand("multinom")
+            clsMultinomFunction.SetPackageName("nnet")
+            Return clsMultinomFunction
+        End Get
+    End Property
     Public Shared ReadOnly Property clsDefaultGlmFunction As RFunction
         Get
 
@@ -91,6 +123,15 @@ Public Class clsRegressionDefaults
         End Get
     End Property
 
+    Public Shared ReadOnly Property clsDefaultAnovaIIFunction As RFunction
+        Get
+            Dim clsDefaultRaovFunction As New RFunction
+            clsDefaultRaovFunction.SetPackageName("car")
+            clsDefaultRaovFunction.SetRCommand("Anova")
+            Return clsDefaultRaovFunction
+        End Get
+    End Property
+
     Public Shared ReadOnly Property clsDefaultFormulaFunction As RFunction
         Get
             Dim clsDefaultRModelsFunction As New RFunction

instat/dlgClimaticCheckDataTemperature.vb

@@ -137,11 +137,11 @@ Public Class dlgClimaticCheckDataTemperature
         ucrNudCoeff.SetLinkedDisplayControl(lblCoeff)
 
         ucrChkSame.SetParameter(New RParameter("same", clsSameOp, 1), bNewChangeParameterValue:=False)
-        ucrChkSame.SetText("Days: (Element1)")
+        ucrChkSame.SetText("Days:")
         ucrChkSame.AddToLinkedControls(ucrNudSame, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=4)
 
         ucrChkJump.SetParameter(New RParameter("jump", clsJumpOp, 1), bNewChangeParameterValue:=False)
-        ucrChkJump.SetText("Jump: (Element1)")
+        ucrChkJump.SetText("Jump:")
         ucrChkJump.AddToLinkedControls(ucrNudJump, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=10)
 
         ucrChkDifference.SetParameter(New RParameter("diff", clsDiffOp, 1), bNewChangeParameterValue:=False)
@@ -597,7 +597,6 @@ Public Class dlgClimaticCheckDataTemperature
         If ucrReceiverElement1.IsEmpty OrElse ucrReceiverElement2.IsEmpty Then
             ucrChkDifference.Enabled = False
             ucrNudDifference.Enabled = False
-            ucrChkDifference.Checked = False
         Else
             ucrChkDifference.Enabled = True
             ucrNudDifference.Enabled = True