update_2020_04_12

This commit is contained in:
annjanu 2020-04-12 23:35:41 +02:00
parent 84a5519395
commit c656e623fd
21 changed files with 46 additions and 26 deletions

Binary file not shown.

View File

@ -0,0 +1,6 @@
{
"ExpandedNodes": [
""
],
"PreviewInSolutionExplorer": false
}

BIN
.vs/slnx.sqlite Normal file

Binary file not shown.

Binary file not shown.

View File

@ -11,7 +11,8 @@
<AssemblyName>Collatz</AssemblyName> <AssemblyName>Collatz</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<PublishUrl>publish\</PublishUrl> <IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>C:\Users\Humanity\Documents\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Disk</InstallFrom> <InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled> <UpdateEnabled>false</UpdateEnabled>
@ -23,7 +24,6 @@
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup> </PropertyGroup>

View File

@ -5,7 +5,7 @@
<EnableUnmanagedDebugging>true</EnableUnmanagedDebugging> <EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PublishUrlHistory>publish\</PublishUrlHistory> <PublishUrlHistory>C:\Users\Humanity\Documents\|publish\</PublishUrlHistory>
<InstallUrlHistory /> <InstallUrlHistory />
<SupportUrlHistory /> <SupportUrlHistory />
<UpdateUrlHistory /> <UpdateUrlHistory />

View File

@ -50,6 +50,7 @@
legend1.Name = "Legend1"; legend1.Name = "Legend1";
this.collatzGraph.Legends.Add(legend1); this.collatzGraph.Legends.Add(legend1);
this.collatzGraph.Location = new System.Drawing.Point(0, 0); 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.Name = "collatzGraph";
this.collatzGraph.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.Berry; this.collatzGraph.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.Berry;
this.collatzGraph.PaletteCustomColors = new System.Drawing.Color[] { this.collatzGraph.PaletteCustomColors = new System.Drawing.Color[] {
@ -60,16 +61,17 @@
series1.Legend = "Legend1"; series1.Legend = "Legend1";
series1.Name = "Collatz Paradox"; series1.Name = "Collatz Paradox";
this.collatzGraph.Series.Add(series1); 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.TabIndex = 0;
this.collatzGraph.Text = "Collatz Problem Plot"; this.collatzGraph.Text = "Collatz Problem Plot";
// //
// textBox1 // textBox1
// //
this.textBox1.Dock = System.Windows.Forms.DockStyle.Right; 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.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.TabIndex = 1;
this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_TextChanged); this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_TextChanged);
// //
@ -77,18 +79,20 @@
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Dock = System.Windows.Forms.DockStyle.Right; 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.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.TabIndex = 2;
this.label1.Text = "x = "; this.label1.Text = "x = ";
// //
// button1 // button1
// //
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); 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.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.TabIndex = 3;
this.button1.Text = "Get Values"; this.button1.Text = "Get Values";
this.button1.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
@ -98,9 +102,10 @@
// //
this.comboBox1.Anchor = System.Windows.Forms.AnchorStyles.Right; this.comboBox1.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.comboBox1.FormattingEnabled = true; 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.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.TabIndex = 4;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
// //
@ -108,18 +113,20 @@
// //
this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label2.AutoSize = true; 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.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.TabIndex = 5;
this.label2.Text = "Graph Type : "; this.label2.Text = "Graph Type : ";
// //
// button2 // button2
// //
this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); 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.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.TabIndex = 6;
this.button2.Text = "Clean Graph"; this.button2.Text = "Clean Graph";
this.button2.UseVisualStyleBackColor = true; this.button2.UseVisualStyleBackColor = true;
@ -127,9 +134,9 @@
// //
// CollatzProblem // 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.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.button2);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.comboBox1); this.Controls.Add(this.comboBox1);
@ -138,6 +145,7 @@
this.Controls.Add(this.textBox1); this.Controls.Add(this.textBox1);
this.Controls.Add(this.collatzGraph); this.Controls.Add(this.collatzGraph);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.Name = "CollatzProblem"; this.Name = "CollatzProblem";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Collatz Paradox"; this.Text = "Collatz Paradox";

View File

@ -1,11 +1,5 @@
using System; using System;
using System.Collections.Generic; 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; using System.Windows.Forms;
@ -102,7 +96,7 @@ namespace Collatz
{ {
if (Int64.Parse(textBox1.Text) > 1) if (Int64.Parse(textBox1.Text) > 1)
{ {
this.x = int.Parse(textBox1.Text); this.x = Int64.Parse(textBox1.Text);
setupChart(); setupChart();
} }
else else

View File

@ -0,0 +1 @@
be45a003ff4754f1fd0a7d72d3fe434c207ebc6e

View File

@ -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\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.dll
C:\Users\muham\documents\visual studio 2013\Projects\Collatz\Collatz\bin\Debug\MetroFramework.pdb 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

View File

@ -28,7 +28,7 @@ namespace Collatz
{ {
richTextBox1.Text += v; richTextBox1.Text += v;
if (v != 1) if (v != 1)
richTextBox1.Text += " >> "; richTextBox1.Text += ", ";
} }
} }