Merge pull request #9344 from Vitalis95/twothreevarsum

Fixed bug with with ordered factors
IDEMSInternational · Jan 10, 2025 · d5ddca1 · d5ddca1
2 parents 2a052d1 + aec89e4
commit d5ddca1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb
@@ -1592,7 +1592,7 @@ Public Class dlgDescribeTwoVariable
             Dim ucrCurrentReceiver As ucrReceiverSingle = If(rdoTwoVariable.Checked,
                 ucrReceiverSecondTwoVariableFactor, ucrReceiverThreeVariableSecondFactor)
             If Not ucrCurrentReceiver.IsEmpty Then
-                strSecondVariableType = If({"factor", "character", "logical"}.Contains(ucrCurrentReceiver.strCurrDataType),
+                strSecondVariableType = If({"factor", "ordered,factor", "character", "logical"}.Contains(ucrCurrentReceiver.strCurrDataType),
                                   "categorical", "numeric")
                 lblSecondType.Text = strSecondVariableType
                 lblSecondType.ForeColor = SystemColors.Highlight
@@ -1653,7 +1653,7 @@ Public Class dlgDescribeTwoVariable
         If rdoThreeVariable.Checked Then
             Dim ucrCurrentReceiver As ucrReceiverSingle = ucrReceiverThreeVariableThirdVariable
             If Not ucrCurrentReceiver.IsEmpty Then
-                strThirdVariableType = If({"factor", "character", "logical"}.Contains(ucrCurrentReceiver.strCurrDataType),
+                strThirdVariableType = If({"factor", "ordered,factor", "character", "logical"}.Contains(ucrCurrentReceiver.strCurrDataType),
                                   "categorical", "numeric")
                 lblThreeVariableCategorical.Text = strThirdVariableType
                 lblThreeVariableCategorical.ForeColor = SystemColors.Highlight

diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb
@@ -207,7 +207,7 @@ Public Class dlgOneVariableSummarise
         ucrChkOmitMissing.AddAdditionalCodeParameterPair(clsSummaryTableFunction, New RParameter("na.rm", iNewPosition:=2), iAdditionalPairNo:=1)
         ucrSaveSummary.AddAdditionalRCode(clsSummaryFunction, iAdditionalPairNo:=1)
         ucrSaveSummary.AddAdditionalRCode(clsJoiningPipeOperator, iAdditionalPairNo:=2)
-        ucrReceiverOneVarSummarise.SetRCode(clsSummaryFunction, bReset)
+        ucrReceiverOneVarSummarise.AddAdditionalCodeParameterPair(clsSummaryFunction, New RParameter("object", iNewPosition:=2), iAdditionalPairNo:=1)
         ucrChkOmitMissing.SetRCode(clsSummaryFunction, bReset)
 
         ucrPnlSummaries.SetRCode(clsDummyFunction, bReset)

diff --git a/instat/dlgReplaceValues.vb b/instat/dlgReplaceValues.vb
@@ -54,7 +54,7 @@ Public Class dlgReplaceValues
         ucrReceiverReplace.SetParameter(New RParameter("col_names", 1))
         ucrReceiverReplace.Selector = ucrSelectorReplace
         ucrReceiverReplace.SetMeAsReceiver()
-        ucrReceiverReplace.SetSingleTypeStatus(True)
+        ucrReceiverReplace.SetSingleTypeStatus(True, bIsCategoricalNumeric:=True)
         ucrReceiverReplace.SetParameterIsString()
 
         'Old Values

diff --git a/instat/ucrReceiverMultiple.vb b/instat/ucrReceiverMultiple.vb
@@ -411,7 +411,7 @@ Public Class ucrReceiverMultiple
                 If bIsCategoricalNumeric Then
                     ' logical can be considered as both categorical or numeric so should be dealt with on individual dialogs
                     For i As Integer = 0 To strDataTypes.Count - 1
-                        If strDataTypes(i).Contains("factor") OrElse strDataTypes(i).Contains("character") Then
+                        If strDataTypes(i).Contains("factor") OrElse strDataTypes(i).Contains("character") OrElse strDataTypes(i).Contains("ordered") Then
                             strDataTypes(i) = "categorical"
                         ElseIf Not strDataTypes(i).Contains("logical") Then
                             strDataTypes(i) = "numeric"