diff --git a/.vs/Collatz-Problem-implemented-on-graph/v16/.suo b/.vs/Collatz-Problem-implemented-on-graph/v16/.suo new file mode 100644 index 0000000..e8eb286 Binary files /dev/null and b/.vs/Collatz-Problem-implemented-on-graph/v16/.suo differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..6b61141 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,6 @@ +{ + "ExpandedNodes": [ + "" + ], + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..2ea0b18 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/Collatz/.vs/Collatz/v16/.suo b/Collatz/.vs/Collatz/v16/.suo new file mode 100644 index 0000000..3219925 Binary files /dev/null and b/Collatz/.vs/Collatz/v16/.suo differ diff --git a/Collatz/Collatz/Collatz.csproj b/Collatz/Collatz/Collatz.csproj index 0b93276..d5a7521 100644 --- a/Collatz/Collatz/Collatz.csproj +++ b/Collatz/Collatz/Collatz.csproj @@ -11,7 +11,8 @@ Collatz v4.5 512 - publish\ + false + C:\Users\Humanity\Documents\ true Disk false @@ -23,7 +24,6 @@ true 0 1.0.0.%2a - false false true diff --git a/Collatz/Collatz/Collatz.csproj.user b/Collatz/Collatz/Collatz.csproj.user index 684362e..1ece27b 100644 --- a/Collatz/Collatz/Collatz.csproj.user +++ b/Collatz/Collatz/Collatz.csproj.user @@ -5,7 +5,7 @@ true - publish\ + C:\Users\Humanity\Documents\|publish\ diff --git a/Collatz/Collatz/CollatzProblem.Designer.cs b/Collatz/Collatz/CollatzProblem.Designer.cs index af523b4..d3bad04 100644 --- a/Collatz/Collatz/CollatzProblem.Designer.cs +++ b/Collatz/Collatz/CollatzProblem.Designer.cs @@ -50,6 +50,7 @@ legend1.Name = "Legend1"; this.collatzGraph.Legends.Add(legend1); this.collatzGraph.Location = new System.Drawing.Point(0, 0); + this.collatzGraph.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.collatzGraph.Name = "collatzGraph"; this.collatzGraph.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.Berry; this.collatzGraph.PaletteCustomColors = new System.Drawing.Color[] { @@ -60,16 +61,17 @@ series1.Legend = "Legend1"; series1.Name = "Collatz Paradox"; this.collatzGraph.Series.Add(series1); - this.collatzGraph.Size = new System.Drawing.Size(624, 441); + this.collatzGraph.Size = new System.Drawing.Size(1248, 848); this.collatzGraph.TabIndex = 0; this.collatzGraph.Text = "Collatz Problem Plot"; // // textBox1 // this.textBox1.Dock = System.Windows.Forms.DockStyle.Right; - this.textBox1.Location = new System.Drawing.Point(520, 0); + this.textBox1.Location = new System.Drawing.Point(1044, 0); + this.textBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(104, 20); + this.textBox1.Size = new System.Drawing.Size(204, 31); this.textBox1.TabIndex = 1; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_TextChanged); // @@ -77,18 +79,20 @@ // this.label1.AutoSize = true; this.label1.Dock = System.Windows.Forms.DockStyle.Right; - this.label1.Location = new System.Drawing.Point(496, 0); + this.label1.Location = new System.Drawing.Point(997, 0); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(24, 13); + this.label1.Size = new System.Drawing.Size(47, 25); this.label1.TabIndex = 2; this.label1.Text = "x = "; // // button1 // this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button1.Location = new System.Drawing.Point(549, 386); + this.button1.Location = new System.Drawing.Point(1098, 742); + this.button1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.Size = new System.Drawing.Size(150, 44); this.button1.TabIndex = 3; this.button1.Text = "Get Values"; this.button1.UseVisualStyleBackColor = true; @@ -98,9 +102,10 @@ // this.comboBox1.Anchor = System.Windows.Forms.AnchorStyles.Right; this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(503, 144); + this.comboBox1.Location = new System.Drawing.Point(1006, 277); + this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(121, 21); + this.comboBox1.Size = new System.Drawing.Size(238, 33); this.comboBox1.TabIndex = 4; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // @@ -108,18 +113,20 @@ // this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(500, 128); + this.label2.Location = new System.Drawing.Point(1000, 246); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(72, 13); + this.label2.Size = new System.Drawing.Size(143, 25); this.label2.TabIndex = 5; this.label2.Text = "Graph Type : "; // // button2 // this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button2.Location = new System.Drawing.Point(549, 415); + this.button2.Location = new System.Drawing.Point(1098, 798); + this.button2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.Size = new System.Drawing.Size(150, 44); this.button2.TabIndex = 6; this.button2.Text = "Clean Graph"; this.button2.UseVisualStyleBackColor = true; @@ -127,9 +134,9 @@ // // CollatzProblem // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(624, 441); + this.ClientSize = new System.Drawing.Size(1248, 848); this.Controls.Add(this.button2); this.Controls.Add(this.label2); this.Controls.Add(this.comboBox1); @@ -138,6 +145,7 @@ this.Controls.Add(this.textBox1); this.Controls.Add(this.collatzGraph); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.Name = "CollatzProblem"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Collatz Paradox"; diff --git a/Collatz/Collatz/CollatzProblem.cs b/Collatz/Collatz/CollatzProblem.cs index 7375a65..970b1d0 100644 --- a/Collatz/Collatz/CollatzProblem.cs +++ b/Collatz/Collatz/CollatzProblem.cs @@ -1,11 +1,5 @@ using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; @@ -102,7 +96,7 @@ namespace Collatz { if (Int64.Parse(textBox1.Text) > 1) { - this.x = int.Parse(textBox1.Text); + this.x = Int64.Parse(textBox1.Text); setupChart(); } else diff --git a/Collatz/Collatz/bin/Debug/Collatz.exe b/Collatz/Collatz/bin/Debug/Collatz.exe index ec8a1d9..d91ddb2 100644 Binary files a/Collatz/Collatz/bin/Debug/Collatz.exe and b/Collatz/Collatz/bin/Debug/Collatz.exe differ diff --git a/Collatz/Collatz/bin/Debug/Collatz.pdb b/Collatz/Collatz/bin/Debug/Collatz.pdb index 20bdad1..8ff54ce 100644 Binary files a/Collatz/Collatz/bin/Debug/Collatz.pdb and b/Collatz/Collatz/bin/Debug/Collatz.pdb differ diff --git a/Collatz/Collatz/bin/Debug/MetroFramework.pdb b/Collatz/Collatz/bin/Debug/MetroFramework.pdb deleted file mode 100644 index e01cee0..0000000 Binary files a/Collatz/Collatz/bin/Debug/MetroFramework.pdb and /dev/null differ diff --git a/Collatz/Collatz/obj/Debug/Collatz.csproj.CopyComplete b/Collatz/Collatz/obj/Debug/Collatz.csproj.CopyComplete new file mode 100644 index 0000000..e69de29 diff --git a/Collatz/Collatz/obj/Debug/Collatz.csproj.CoreCompileInputs.cache b/Collatz/Collatz/obj/Debug/Collatz.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..1a1a40d --- /dev/null +++ b/Collatz/Collatz/obj/Debug/Collatz.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +be45a003ff4754f1fd0a7d72d3fe434c207ebc6e diff --git a/Collatz/Collatz/obj/Debug/Collatz.csproj.FileListAbsolute.txt b/Collatz/Collatz/obj/Debug/Collatz.csproj.FileListAbsolute.txt index bc5a797..fbc5b9e 100644 --- a/Collatz/Collatz/obj/Debug/Collatz.csproj.FileListAbsolute.txt +++ b/Collatz/Collatz/obj/Debug/Collatz.csproj.FileListAbsolute.txt @@ -10,3 +10,14 @@ C:\Users\muham\documents\visual studio 2013\Projects\Collatz\Collatz\bin\Debug\C C:\Users\muham\documents\visual studio 2013\Projects\Collatz\Collatz\obj\Debug\Collatz.csprojResolveAssemblyReference.cache C:\Users\muham\documents\visual studio 2013\Projects\Collatz\Collatz\bin\Debug\MetroFramework.dll C:\Users\muham\documents\visual studio 2013\Projects\Collatz\Collatz\bin\Debug\MetroFramework.pdb +C:\Users\Humanity\Source\Repos\annjanu\Collatz-Problem-implemented-on-graph\Collatz\Collatz\bin\Debug\Collatz.exe.config +C:\Users\Humanity\Source\Repos\annjanu\Collatz-Problem-implemented-on-graph\Collatz\Collatz\bin\Debug\Collatz.exe +C:\Users\Humanity\Source\Repos\annjanu\Collatz-Problem-implemented-on-graph\Collatz\Collatz\bin\Debug\Collatz.pdb +C:\Users\Humanity\Source\Repos\annjanu\Collatz-Problem-implemented-on-graph\Collatz\Collatz\obj\Debug\Collatz.CollatzProblem.resources +C:\Users\Humanity\Source\Repos\annjanu\Collatz-Problem-implemented-on-graph\Collatz\Collatz\obj\Debug\Collatz.Properties.Resources.resources +C:\Users\Humanity\Source\Repos\annjanu\Collatz-Problem-implemented-on-graph\Collatz\Collatz\obj\Debug\Collatz.valuesDisplay.resources +C:\Users\Humanity\Source\Repos\annjanu\Collatz-Problem-implemented-on-graph\Collatz\Collatz\obj\Debug\Collatz.csproj.GenerateResource.cache +C:\Users\Humanity\Source\Repos\annjanu\Collatz-Problem-implemented-on-graph\Collatz\Collatz\obj\Debug\Collatz.csproj.CoreCompileInputs.cache +C:\Users\Humanity\Source\Repos\annjanu\Collatz-Problem-implemented-on-graph\Collatz\Collatz\obj\Debug\Collatz.csproj.CopyComplete +C:\Users\Humanity\Source\Repos\annjanu\Collatz-Problem-implemented-on-graph\Collatz\Collatz\obj\Debug\Collatz.exe +C:\Users\Humanity\Source\Repos\annjanu\Collatz-Problem-implemented-on-graph\Collatz\Collatz\obj\Debug\Collatz.pdb diff --git a/Collatz/Collatz/obj/Debug/Collatz.csproj.GenerateResource.Cache b/Collatz/Collatz/obj/Debug/Collatz.csproj.GenerateResource.Cache index f6de0cd..9d7709e 100644 Binary files a/Collatz/Collatz/obj/Debug/Collatz.csproj.GenerateResource.Cache and b/Collatz/Collatz/obj/Debug/Collatz.csproj.GenerateResource.Cache differ diff --git a/Collatz/Collatz/obj/Debug/Collatz.csprojAssemblyReference.cache b/Collatz/Collatz/obj/Debug/Collatz.csprojAssemblyReference.cache new file mode 100644 index 0000000..0f7c7a1 Binary files /dev/null and b/Collatz/Collatz/obj/Debug/Collatz.csprojAssemblyReference.cache differ diff --git a/Collatz/Collatz/obj/Debug/Collatz.exe b/Collatz/Collatz/obj/Debug/Collatz.exe index ec8a1d9..d91ddb2 100644 Binary files a/Collatz/Collatz/obj/Debug/Collatz.exe and b/Collatz/Collatz/obj/Debug/Collatz.exe differ diff --git a/Collatz/Collatz/obj/Debug/Collatz.pdb b/Collatz/Collatz/obj/Debug/Collatz.pdb index 20bdad1..8ff54ce 100644 Binary files a/Collatz/Collatz/obj/Debug/Collatz.pdb and b/Collatz/Collatz/obj/Debug/Collatz.pdb differ diff --git a/Collatz/Collatz/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Collatz/Collatz/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 7e6554e..af279e7 100644 Binary files a/Collatz/Collatz/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Collatz/Collatz/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Collatz/Collatz/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Collatz/Collatz/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 889f11f..d7b77bf 100644 Binary files a/Collatz/Collatz/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Collatz/Collatz/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Collatz/Collatz/valuesDisplay.cs b/Collatz/Collatz/valuesDisplay.cs index ab0b59f..813763e 100644 --- a/Collatz/Collatz/valuesDisplay.cs +++ b/Collatz/Collatz/valuesDisplay.cs @@ -28,7 +28,7 @@ namespace Collatz { richTextBox1.Text += v; if (v != 1) - richTextBox1.Text += " >> "; + richTextBox1.Text += ", "; } }