Merge pull request #38 from africanmathsinitiative/master

Merge from Master Copy

instat/My Project/Resources.resx

@@ -1522,4 +1522,31 @@
   <data name="Students_t" xml:space="preserve">
     <value>Students t</value>
   </data>
+  <data name="b" xml:space="preserve">
+    <value>b</value>
+  </data>
+  <data name="Cauchy" xml:space="preserve">
+    <value>Cauchy</value>
+  </data>
+  <data name="Chi_Square" xml:space="preserve">
+    <value>Chi-Square</value>
+  </data>
+  <data name="DF" xml:space="preserve">
+    <value>DF</value>
+  </data>
+  <data name="F" xml:space="preserve">
+    <value>F</value>
+  </data>
+  <data name="Hypergeometric" xml:space="preserve">
+    <value>Hypergeometric</value>
+  </data>
+  <data name="Lognormal" xml:space="preserve">
+    <value>Lognormal</value>
+  </data>
+  <data name="Meanlog" xml:space="preserve">
+    <value>Meanlog</value>
+  </data>
+  <data name="SDlog" xml:space="preserve">
+    <value>SDlog</value>
+  </data>
 </root>

instat/clsInstatOptions.vb

@@ -1,16 +1,33 @@
 Imports System.Threading
 Imports System.Globalization
 Imports unvell.ReoGrid
-Public Class InstatOptions
+
+<Serializable()> Public Class InstatOptions
     Public bIncludeRDefaultParameters As Boolean
     Public fntOutput, fntScript, fntComment, fntEditor As Font
     Public clrOutput, clrScript, clrComment, clrEditor As Color
     Public strComment, strLanguageCultureCode As String
     Public strWorkingDirectory As String
     Public iPreviewRows As Integer
     Public iMaxRows As Integer
-    Public lstColourPalette As List(Of Color)
-
+    Public lstColourPalette As List(Of Color)
+
+    Public Sub New()
+        'TODO Is this sensible to do in constructor?
+        bIncludeRDefaultParameters = False
+        SetFormatOutput(New Font(FontFamily.GenericMonospace, 8, FontStyle.Regular), Color.Blue)
+        SetFormatComment(New Font(FontFamily.GenericSansSerif, 8, FontStyle.Regular), Color.Green)
+        SetFormatCommand(New Font(FontFamily.GenericSansSerif, 8, FontStyle.Regular), Color.Black)
+        SetEditorFormat(New Font(FontFamily.GenericSansSerif, 10, FontStyle.Regular), Color.Black)
+        SetPreviewRows(10)
+        SetMaxRows(1000)
+        SetComment("code generated by the dialog")
+        'TODO is this sensible?
+        SetLanguageCultureCode(Thread.CurrentThread.CurrentCulture.Name)
+        SetWorkingDirectory(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
+        SetColorPalette(({Color.Aqua, Color.Gray, Color.LightGreen, Color.AliceBlue, Color.Maroon, Color.Green, Color.LightPink, Color.LightSkyBlue, Color.Brown, Color.MediumPurple, Color.White}).ToList)
+    End Sub
+
     Public Sub SetMaxRows(iRows As Integer)
         iMaxRows = iRows
         frmMain.clsGrids.SetMaxRows(iMaxRows)
@@ -78,4 +95,4 @@ Public Class InstatOptions
     Public Sub SetColorPalette(lstColours As List(Of Color))
         lstColourPalette = lstColours
     End Sub
-End Class
+End Class

instat/dlgOneVariableGraph.vb

@@ -175,4 +175,4 @@ Public Class dlgOneVariableGraph
             rdoCombineGraph.Enabled = False
         End If
     End Sub
-End Class
+End Class

instat/dlgRandomSample.vb

@@ -18,6 +18,7 @@ Imports instat.Translations
 Public Class dlgRandomSample
     Public bFirstLoad As Boolean = True
     Private clsMultipleSamplesFunction As New RFunction
+    Public clsCurrentDistribution As New Distribution
     Private clsDistribtionFunction As New RFunction
     Private clsSetSeed As New RFunction
 
@@ -53,7 +54,7 @@ Public Class dlgRandomSample
 
     Private Sub SetDefaults()
         ucrPrefixNewColumns.SetName("Rand")
-        SetDataFrameParameters()
+        SetDataFrameandDistributionParameters()
         nudNumberOfSamples.Value = 1
         SetNumberOfSamplesParameters()
         chkSetSeed.Checked = False
@@ -66,7 +67,7 @@ Public Class dlgRandomSample
     End Sub
 
     Private Sub ucrDataFrameSelector_DataFrameChanged(sender As Object, e As EventArgs, strPrevDataFrame As String) Handles ucrSelectorRandomSamples.DataFrameChanged
-        SetDataFrameParameters()
+        SetDataFrameandDistributionParameters()
         TestOKEnabled()
     End Sub
 
@@ -84,8 +85,13 @@ Public Class dlgRandomSample
         End If
     End Sub
 
-    Private Sub SetDataFrameParameters()
-        clsDistribtionFunction.AddParameter("n", ucrSelectorRandomSamples.iDataFrameLength)
+    Private Sub SetDataFrameandDistributionParameters()
+        If ucrDistWithParameters.clsCurrDistribution.strRName = "hyper" Then
+            clsDistribtionFunction.AddParameter("nn", ucrSelectorRandomSamples.iDataFrameLength)
+        Else
+            clsDistribtionFunction.RemoveParameterByName("nn")
+            clsDistribtionFunction.AddParameter("n", ucrSelectorRandomSamples.iDataFrameLength)
+        End If
         SetAssignTo()
         TestOKEnabled()
     End Sub
@@ -172,4 +178,7 @@ Public Class dlgRandomSample
         TestOKEnabled()
     End Sub
 
+    Private Sub ucrDistWithParameters_cboDistributionsIndexChanged(sender As Object, e As EventArgs) Handles ucrDistWithParameters.cboDistributionsIndexChanged
+        SetDataFrameandDistributionParameters()
+    End Sub
 End Class