Download R-Instat
-
In response to the recent review of R-Instat by Bob Muenchen we have released a new version of R-Instat, version 0.7.4, which includes some new features and initial improvements from the review. Many thanks to Bob for reviewing R-Instat.
+
In response to the recent review of R-Instat by Bob Muenchen we have released a new version of R-Instat, version 0.7.5, which includes some new features and initial improvements from the review. Many thanks to Bob for reviewing R-Instat.
-
R-Instat 0.7.4 Installer 32 Bit (.exe 734MB)
+
R-Instat 0.7.5 Installer 32 Bit (.exe 734MB)
If you know that you have a 64 bit computer, we suggest you download the 64 Bit version
-
R-Instat 0.7.4 Installer 64 Bit (.exe 736MB)
+
R-Instat 0.7.5 Installer 64 Bit (.exe 736MB)
R-Instat is currently a Windows only application. However, it can be accessed on Mac or Linux through use of a Virtual Windows Machine.
Installation & Documentation
diff --git a/instat/dlgMergeAdditionalData.vb b/instat/dlgMergeAdditionalData.vb
index 73d7a235abb..da4d4522640 100644
--- a/instat/dlgMergeAdditionalData.vb
+++ b/instat/dlgMergeAdditionalData.vb
@@ -158,12 +158,12 @@ Public Class dlgMergeAdditionalData
End Sub
Private Sub SetMergingBy()
- Dim lstJoiningColumns As New List(Of String)
+ Dim dctJoinColumns As New Dictionary(Of String, String)
lstJoinColumns.Clear()
If ucrFromDataFrame.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso ucrToDataFrame.cboAvailableDataFrames.Text <> "" Then
If clsLeftJoinFunction.ContainsParameter("by") Then
For Each clsTempParam As RParameter In clsByListFunction.clsParameters
- lstJoiningColumns.Add(clsTempParam.strArgumentName.Trim(Chr(34)))
+ dctJoinColumns.Add(clsTempParam.strArgumentName.Trim(Chr(34)), clsTempParam.strArgumentValue.Trim(Chr(34)))
Next
Else
Dim lstFirstColumns As List(Of String)
@@ -173,7 +173,7 @@ Public Class dlgMergeAdditionalData
Dim i As Integer = 0
For Each strFirst As String In lstFirstColumns
If lstSecondColumns.Contains(strFirst) Then
- lstJoiningColumns.Add(strFirst)
+ dctJoinColumns.Add(strFirst, strFirst)
clsByListFunction.AddParameter(Chr(34) & strFirst & Chr(34), Chr(34) & strFirst & Chr(34), iPosition:=i)
i += 1
End If
@@ -182,11 +182,11 @@ Public Class dlgMergeAdditionalData
clsLeftJoinFunction.AddParameter("by", clsRFunctionParameter:=clsByListFunction, iPosition:=2)
End If
End If
- If lstJoiningColumns.Count > 0 Then
+ If dctJoinColumns.Count > 0 Then
Dim lstJoinPairs As New List(Of String)
- For Each kvpTemp As String In lstJoiningColumns
- lstJoinPairs.Add(kvpTemp & " = " & kvpTemp)
- lstJoinColumns.Add(kvpTemp)
+ For Each kvpTemp As KeyValuePair(Of String, String) In dctJoinColumns
+ lstJoinPairs.Add(kvpTemp.Key & " = " & kvpTemp.Value)
+ lstJoinColumns.Add(kvpTemp.Value)
Next
ucrInputMergingBy.SetName(String.Join(", ", lstJoinPairs))
ucrInputMergingBy.txtInput.BackColor = SystemColors.Control
@@ -203,7 +203,7 @@ Public Class dlgMergeAdditionalData
clsLeftJoinFunction.RemoveParameterByName("by")
clsByListFunction.ClearParameters()
End If
- bBySpecified = (lstJoiningColumns.Count > 0)
+ bBySpecified = (dctJoinColumns.Count > 0)
TestOkEnabled()
End Sub
@@ -236,7 +236,7 @@ Public Class dlgMergeAdditionalData
Dim clsAnyDuplicatesFunction As New RFunction
Dim iAnyDuplicated As Integer
- If ucrInputMergingBy.GetText <> "" Then
+ If ucrInputMergingBy.GetText <> "" AndAlso lstJoinColumns.Count > 0 Then
clsGetVariablesFunction.AddParameter("col_names", frmMain.clsRLink.GetListAsRString(lstJoinColumns, bWithQuotes:=True), iPosition:=1)
clsAnyDuplicatesFunction.SetRCommand("anyDuplicated")
clsAnyDuplicatesFunction.AddParameter("x", clsRFunctionParameter:=clsGetVariablesFunction)
diff --git a/instat/dlgRowSummary.vb b/instat/dlgRowSummary.vb
index ea151c777cf..cfe6e2b6196 100644
--- a/instat/dlgRowSummary.vb
+++ b/instat/dlgRowSummary.vb
@@ -573,8 +573,10 @@ Public Class dlgRowSummary
Private Sub AddConcatenateParameters()
clsConcatenateFunction.ClearParameters()
If rdoRowRanks.Checked Then
+ Dim iPosition As Integer = 0
For Each strVariable In ucrReceiverForRowSummaries.GetVariableNamesAsList
- clsConcatenateFunction.AddParameter(strVariable, Chr(34) & strVariable & "_r" & Chr(34), bIncludeArgumentName:=False, iPosition:=0)
+ clsConcatenateFunction.AddParameter(strVariable, Chr(34) & strVariable & "_r" & Chr(34), bIncludeArgumentName:=False, iPosition:=iPosition)
+ iPosition += 1
Next
ElseIf rdoRowRange.Checked Then
clsConcatenateFunction.AddParameter("r_min", Chr(34) & "r_min" & Chr(34), bIncludeArgumentName:=False, iPosition:=0)
diff --git a/instat/dlgTransposeColumns.vb b/instat/dlgTransposeColumns.vb
index f5b7d79759a..a5b04a50f6a 100644
--- a/instat/dlgTransposeColumns.vb
+++ b/instat/dlgTransposeColumns.vb
@@ -17,8 +17,9 @@ Imports instat.Translations
Public Class dlgTransposeColumns
Private bFirstLoad As Boolean = True
Private bReset As Boolean = True
+ Private bResettingDialogue As Boolean = False
Private clsOverallFunction, clsTransposeFunction, clsGetColumnNamesFunction As New RFunction
- Private lstVariables As New List(Of String)
+ Private lstEditedVariables, lstAllVariables As New List(Of String)
Private Sub dlgTransposeColumns_Load(sender As Object, e As EventArgs) Handles MyBase.Load
If bFirstLoad Then
InitialiseDialog()
@@ -67,7 +68,6 @@ Public Class dlgTransposeColumns
clsTransposeFunction.SetPackageName("data.table")
clsTransposeFunction.SetRCommand("transpose")
clsTransposeFunction.AddParameter("l", "columns", iPosition:=0)
- clsTransposeFunction.AddParameter("make.names", "NULL", iPosition:=1)
ucrBase.clsRsyntax.SetBaseRFunction(clsOverallFunction)
End Sub
Private Sub SetRCodeforControls(bReset As Boolean)
@@ -89,9 +89,12 @@ Public Class dlgTransposeColumns
End If
End Sub
Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+ bResettingDialogue = True
SetDefaults()
SetRCodeforControls(True)
+ UpdateSelector()
TestOkEnabled()
+ bResettingDialogue = False
End Sub
Private Sub NewDefaultName()
If (Not ucrNewDataframe.bUserTyped) AndAlso ucrSelectorTransposeColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" Then
@@ -106,36 +109,37 @@ Public Class dlgTransposeColumns
clsGetColumnNamesFunction = ucrReceiverColumnsToTranspose.GetVariables(True).Clone
clsGetColumnNamesFunction.SetAssignTo("columns")
ucrBase.clsRsyntax.AddToBeforeCodes(clsGetColumnNamesFunction)
- If ucrReceiverColumnsToTranspose.IsEmpty AndAlso lstVariables.Count > 0 Then
+ If ucrReceiverColumnsToTranspose.IsEmpty AndAlso lstEditedVariables.Count > 0 Then
UpdateSelector()
ucrReceiverColumnsToTranspose.SetMeAsReceiver()
End If
+ If ucrReceiverColumnsToTranspose.IsEmpty Then
+ ucrReceiverVariableNames.Clear()
+ End If
End Sub
-
Private Sub UpdateSelector()
ClearSelector()
- For i = 0 To lstVariables.Count - 1
- ucrSelectorTransposeColumns.lstAvailableVariable.Items.Add(lstVariables.Item(i))
- ucrSelectorTransposeColumns.lstAvailableVariable.Items(i).Tag = ucrSelectorTransposeColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text
- Next
- End Sub
-
- Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToTranspose.ControlContentsChanged,
- ucrNewDataframe.ControlContentsChanged, ucrReceiverVariableNames.ControlContentsChanged, ucrChkDisplayVariableNames.ControlContentsChanged,
- ucrInputDisplayVariableNames.ControlContentsChanged
- TestOkEnabled()
+ If bResettingDialogue Then
+ For i = 0 To lstAllVariables.Count - 1
+ ucrSelectorTransposeColumns.lstAvailableVariable.Items.Add(lstAllVariables.Item(i))
+ ucrSelectorTransposeColumns.lstAvailableVariable.Items(i).Tag = ucrSelectorTransposeColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text
+ Next
+ Else
+ For i = 0 To lstEditedVariables.Count - 1
+ ucrSelectorTransposeColumns.lstAvailableVariable.Items.Add(lstEditedVariables.Item(i))
+ ucrSelectorTransposeColumns.lstAvailableVariable.Items(i).Tag = ucrSelectorTransposeColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text
+ Next
+ End If
End Sub
-
Private Sub ClearSelector()
ucrSelectorTransposeColumns.lstAvailableVariable.Clear()
ucrSelectorTransposeColumns.lstAvailableVariable.Groups.Clear()
ucrSelectorTransposeColumns.lstAvailableVariable.Columns.Add("Variables")
End Sub
-
Private Sub ucrReceiverVariableNames_Enter(sender As Object, e As EventArgs) Handles ucrReceiverVariableNames.Enter
Dim grps As New ListViewGroup
+ ClearSelector()
If Not ucrReceiverColumnsToTranspose.IsEmpty Then
- ClearSelector()
If ucrReceiverColumnsToTranspose.GetVariableNamesList(False).Count > 1 Then
grps = New ListViewGroup(key:=ucrSelectorTransposeColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text,
headerText:=ucrSelectorTransposeColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text)
@@ -148,28 +152,30 @@ Public Class dlgTransposeColumns
Next
End If
End Sub
-
Private Sub ucrSelectorTransposeColumns_DataFrameChanged() Handles ucrSelectorTransposeColumns.DataFrameChanged
- If ucrSelectorTransposeColumns.lstAvailableVariable.Items.Count > 0 Then
- lstVariables.Clear()
- For Each lstv As ListViewItem In ucrSelectorTransposeColumns.lstAvailableVariable.Items
- lstVariables.Add(lstv.Text)
- Next
- End If
- End Sub
-
- Private Sub ucrReceiverVariableNames_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverVariableNames.ControlValueChanged
- ResetSelector()
- End Sub
-
- Private Sub ResetSelector()
- If ucrReceiverVariableNames.IsEmpty AndAlso Not ucrReceiverColumnsToTranspose.IsEmpty _
- AndAlso ucrSelectorTransposeColumns.lstAvailableVariable.Items.Count > 0 Then
- UpdateSelector()
+ If Not bResettingDialogue Then
+ If ucrSelectorTransposeColumns.lstAvailableVariable.Items.Count > 0 Then
+ lstEditedVariables.Clear()
+ lstAllVariables.Clear()
+ For Each lstv As ListViewItem In ucrSelectorTransposeColumns.lstAvailableVariable.Items
+ lstAllVariables.Add(lstv.Text)
+ lstEditedVariables.Add(lstv.Text)
+ Next
+ End If
End If
End Sub
-
Private Sub ucrReceiverColumnsToTranspose_Enter(sender As Object, e As EventArgs) Handles ucrReceiverColumnsToTranspose.Enter
- ResetSelector()
+ bResettingDialogue = True
+ UpdateSelector()
+ bResettingDialogue = False
+ 'If Not ucrReceiverColumnsToTranspose.IsEmpty AndAlso
+ ' ucrSelectorTransposeColumns.lstAvailableVariable.Items.Count > 0 Then
+ ' UpdateSelector()
+ 'End If
+ End Sub
+ Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToTranspose.ControlContentsChanged,
+ ucrNewDataframe.ControlContentsChanged, ucrReceiverVariableNames.ControlContentsChanged, ucrChkDisplayVariableNames.ControlContentsChanged,
+ ucrInputDisplayVariableNames.ControlContentsChanged
+ TestOkEnabled()
End Sub
End Class
\ No newline at end of file
diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb
index 4dd5fec003a..807c7e5c1ea 100644
--- a/instat/frmMain.Designer.vb
+++ b/instat/frmMain.Designer.vb
@@ -458,6 +458,7 @@ Partial Class frmMain
Me.mnuPrepareCheckDataOneVariableSummarise = New System.Windows.Forms.ToolStripMenuItem()
Me.mnuPrepareCheckDataOneVariableGraph = New System.Windows.Forms.ToolStripMenuItem()
Me.mnuPrepareCheckDataOneWayFrequencies = New System.Windows.Forms.ToolStripMenuItem()
+ Me.mnuPrepareCheckDataViewDeleteLabels = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator41 = New System.Windows.Forms.ToolStripSeparator()
Me.mnuPrepareCheckDataExportOpenRefine = New System.Windows.Forms.ToolStripMenuItem()
Me.mnuPrepareCheckDataImportOpenRefine = New System.Windows.Forms.ToolStripMenuItem()
@@ -525,6 +526,7 @@ Partial Class frmMain
Me.mnuPrepareColumnReshapeRandomSubset = New System.Windows.Forms.ToolStripMenuItem()
Me.mnuPrepareColumnReshapeTranspose = New System.Windows.Forms.ToolStripMenuItem()
Me.mnuPrepareDataReshapeScaleOrDistance = New System.Windows.Forms.ToolStripMenuItem()
+ Me.mnuPrepareDataReshapeRandomSplit = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
Me.mnuPrepareKeysAndLinks = New System.Windows.Forms.ToolStripMenuItem()
Me.mnuPrepareKeysAndLinksAddKey = New System.Windows.Forms.ToolStripMenuItem()
@@ -674,7 +676,6 @@ Partial Class frmMain
Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem()
Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem()
Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem()
- Me.mnuPrepareCheckDataViewDeleteLabels = New System.Windows.Forms.ToolStripMenuItem()
Me.stsStrip.SuspendLayout()
Me.Tool_strip.SuspendLayout()
Me.mnuBar.SuspendLayout()
@@ -1216,7 +1217,7 @@ Partial Class frmMain
'mnuModelOtherOneVariableExactResults
'
Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults"
- Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22)
+ Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(180, 22)
Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..."
Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..."
'
@@ -1224,7 +1225,7 @@ Partial Class frmMain
'
Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False
Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData"
- Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22)
+ Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(180, 22)
Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..."
Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..."
'
@@ -1232,7 +1233,7 @@ Partial Class frmMain
'
Me.mnuModelOtherOneVariableNonParametric.Enabled = False
Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric"
- Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22)
+ Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(180, 22)
Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..."
Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..."
'
@@ -1240,7 +1241,7 @@ Partial Class frmMain
'
Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False
Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit"
- Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22)
+ Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(180, 22)
Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit"
Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..."
'
@@ -3572,6 +3573,12 @@ Partial Class frmMain
Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22)
Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..."
'
+ 'mnuPrepareCheckDataViewDeleteLabels
+ '
+ Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels"
+ Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22)
+ Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..."
+ '
'ToolStripSeparator41
'
Me.ToolStripSeparator41.Name = "ToolStripSeparator41"
@@ -3705,98 +3712,98 @@ Partial Class frmMain
'mnuPrepareColumnFactorConvertToFactor
'
Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor"
- Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor"
Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..."
'
'mnuPrepareColumnFactorRecodeNumeric
'
Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric"
- Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..."
Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..."
'
'mnuPrepareColumnFactorCountInFactor
'
Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor"
- Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..."
'
'ToolStripSeparator12
'
Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
- Me.ToolStripSeparator12.Size = New System.Drawing.Size(177, 6)
+ Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6)
'
'mnuPrepareColumnFactorRecodeFactor
'
Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor"
- Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..."
Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..."
'
'mnuPrepareColumnFactorCombineFactors
'
Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors"
- Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..."
Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..."
'
'mnuPrepareColumnFactorDummyVariables
'
Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables"
- Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..."
Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..."
'
'ToolStripSeparator14
'
Me.ToolStripSeparator14.Name = "ToolStripSeparator14"
- Me.ToolStripSeparator14.Size = New System.Drawing.Size(177, 6)
+ Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6)
'
'mnuPrepareColumnFactorLevelsLabels
'
Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels"
- Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..."
Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..."
'
'mnuPrepareColumnFactorReorderLevels
'
Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels"
- Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..."
Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..."
'
'mnuPrepareColumnFactorReferenceLevel
'
Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel"
- Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..."
Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..."
'
'mnuPrepareColumnFactorUnusedLevels
'
Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels"
- Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..."
Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..."
'
'mnuPrepareColumnFactorContrasts
'
Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts"
- Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..."
Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..."
'
'ToolStripSeparator19
'
Me.ToolStripSeparator19.Name = "ToolStripSeparator19"
- Me.ToolStripSeparator19.Size = New System.Drawing.Size(177, 6)
+ Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6)
'
'mnuPrepareColumnFactorFactorDataFrame
'
Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame"
- Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(180, 22)
+ Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22)
Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame"
Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..."
'
@@ -3930,7 +3937,7 @@ Partial Class frmMain
'
'mnuPrepareDataReshape
'
- Me.mnuPrepareDataReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnReshapeColumnSummaries, Me.mnuPrepareColumnReshapeGeneralSummaries, Me.ToolStripSeparator10, Me.mnuPrepareColumnReshapeStack, Me.mnuPrepareColumnReshapeUnstack, Me.mnuPrepareColumnReshapeMerge, Me.ToolStripSeparator11, Me.mnuPrepareAppendDataFrame, Me.mnuPrepareColumnReshapeSubset, Me.mnuPrepareColumnReshapeRandomSubset, Me.mnuPrepareColumnReshapeTranspose, Me.mnuPrepareDataReshapeScaleOrDistance})
+ Me.mnuPrepareDataReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnReshapeColumnSummaries, Me.mnuPrepareColumnReshapeGeneralSummaries, Me.ToolStripSeparator10, Me.mnuPrepareColumnReshapeStack, Me.mnuPrepareColumnReshapeUnstack, Me.mnuPrepareColumnReshapeMerge, Me.ToolStripSeparator11, Me.mnuPrepareAppendDataFrame, Me.mnuPrepareColumnReshapeSubset, Me.mnuPrepareColumnReshapeRandomSubset, Me.mnuPrepareColumnReshapeTranspose, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit})
Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape"
Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(186, 22)
Me.mnuPrepareDataReshape.Tag = ""
@@ -4013,6 +4020,13 @@ Partial Class frmMain
Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22)
Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..."
'
+ 'mnuPrepareDataReshapeRandomSplit
+ '
+ Me.mnuPrepareDataReshapeRandomSplit.Enabled = False
+ Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit"
+ Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22)
+ Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..."
+ '
'ToolStripSeparator7
'
Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
@@ -5067,12 +5081,6 @@ Partial Class frmMain
Me.mnuLogFile.Text = "Log Window..."
Me.mnuLogFile.ToolTipText = "Log Window"
'
- 'mnuPrepareCheckDataViewDeleteLabels
- '
- Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels"
- Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22)
- Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..."
- '
'frmMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -5763,4 +5771,5 @@ Partial Class frmMain
Friend WithEvents ToolStripSeparator36 As ToolStripSeparator
Friend WithEvents mnuPrepareDataFrameAddMergeColumns As ToolStripMenuItem
Friend WithEvents mnuPrepareCheckDataViewDeleteLabels As ToolStripMenuItem
+ Friend WithEvents mnuPrepareDataReshapeRandomSplit As ToolStripMenuItem
End Class
diff --git a/instat/frmMain.vb b/instat/frmMain.vb
index bc2553eada4..de2fb1634a7 100644
--- a/instat/frmMain.vb
+++ b/instat/frmMain.vb
@@ -2436,4 +2436,8 @@ Public Class frmMain
Private Sub mnuPrepareCheckDataViewDeleteLabels_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataViewDeleteLabels.Click
dlgViewFactorLabels.ShowDialog()
End Sub
+
+ Private Sub RandomSplitToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataReshapeRandomSplit.Click
+ dlgRandomSplit.ShowDialog()
+ End Sub
End Class
diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R
index 73ce9f5b765..0d10037aa59 100644
--- a/instat/static/InstatObject/R/install_packages.R
+++ b/instat/static/InstatObject/R/install_packages.R
@@ -124,6 +124,7 @@ pkgs <-
# Model > Probability Distributions > Show Model
# Model > Probability Distributions > Random Samples
"mc2d",
+ # For creating extra summary statistics in Describe > Two/Three Variables > Summarise
"skimr",
# For fast creation of dummy (binary) variables from categories variables in Prepare > Column:Factor > Dummy Variables
"fastDummies",