Исправил задание 3

Prakt2/WindowsFormsApp1/WindowsFormsApp1/Form1.Designer.cs → Prakt2/WindowsFormsApp1/WindowsFormsApp1/LineAlgoritm.Designer.cs

@@ -1,6 +1,6 @@
 namespace WindowsFormsApp1
 {
-    partial class Form1
+    partial class LineAlgoritm
     {
         /// <summary>
         /// Обязательная переменная конструктора.
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LineAlgoritm));
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.tbVariableA = new System.Windows.Forms.TextBox();
             this.tbInputA = new System.Windows.Forms.TextBox();
@@ -151,7 +151,7 @@
             this.MinimizeBox = false;
             this.Name = "Form1";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Form1";
+            this.Text = "Линейный алгоритм";
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();

Prakt2/WindowsFormsApp1/WindowsFormsApp1/Form1.cs → Prakt2/WindowsFormsApp1/WindowsFormsApp1/LineAlgoritm.cs

@@ -10,7 +10,7 @@ using System.Windows.Forms;
 
 namespace WindowsFormsApp1
 {
-    public partial class Form1 : Form
+    public partial class LineAlgoritm : Form
     {
         /// <summary>
         /// Обьявление переменных
@@ -77,7 +77,7 @@ namespace WindowsFormsApp1
                 tbInputA.Text = "Ошибка";
             }
         }
-        public Form1()
+        public LineAlgoritm()
         {
             InitializeComponent();
         }

Prakt2/WindowsFormsApp1/WindowsFormsApp1/Program.cs

@@ -17,7 +17,7 @@ namespace WindowsFormsApp1
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Form1());
+            Application.Run(new LineAlgoritm());
         }
     }
 }

Prakt2/WindowsFormsApp1/WindowsFormsApp1/WindowsFormsApp1.csproj

@@ -46,16 +46,16 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Form1.cs">
+    <Compile Include="LineAlgoritm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <Compile Include="LineAlgoritm.Designer.cs">
+      <DependentUpon>LineAlgoritm.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <EmbeddedResource Include="LineAlgoritm.resx">
+      <DependentUpon>LineAlgoritm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

Prakt2/WindowsFormsApp1/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-8069502011d0681850e57a53d5a1673222f430a6
+a60754a33452f4c099a84b9165f5dee3e7ff4c81

Prakt2/WindowsFormsApp1/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt

@@ -13,9 +13,9 @@ C:\Users\user\Desktop\git\Prakt2\WindowsFormsApp1\WindowsFormsApp1\bin\Debug\Win
 C:\Users\user\Desktop\git\Prakt2\WindowsFormsApp1\WindowsFormsApp1\bin\Debug\WindowsFormsApp1.exe
 C:\Users\user\Desktop\git\Prakt2\WindowsFormsApp1\WindowsFormsApp1\bin\Debug\WindowsFormsApp1.pdb
 C:\Users\user\Desktop\git\Prakt2\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.csproj.AssemblyReference.cache
-C:\Users\user\Desktop\git\Prakt2\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.Form1.resources
 C:\Users\user\Desktop\git\Prakt2\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.Properties.Resources.resources
 C:\Users\user\Desktop\git\Prakt2\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.csproj.GenerateResource.cache
 C:\Users\user\Desktop\git\Prakt2\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.csproj.CoreCompileInputs.cache
 C:\Users\user\Desktop\git\Prakt2\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.exe
 C:\Users\user\Desktop\git\Prakt2\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.pdb
+C:\Users\user\Desktop\git\Prakt2\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.LineAlgoritm.resources

Prakt3/WindowsFormsApp1/WindowsFormsApp1/Form1.Designer.cs → Prakt3/WindowsFormsApp1/WindowsFormsApp1/Algoritm.Designer.cs

@@ -1,7 +1,7 @@
 
 namespace WindowsFormsApp1
 {
-    partial class Form1
+    partial class Algoritm
     {
         /// <summary>
         /// Обязательная переменная конструктора.
@@ -29,7 +29,7 @@ namespace WindowsFormsApp1
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Algoritm));
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.tbOutput = new System.Windows.Forms.TextBox();
             this.tbInputX = new System.Windows.Forms.TextBox();
@@ -37,6 +37,11 @@ namespace WindowsFormsApp1
             this.textBox4 = new System.Windows.Forms.TextBox();
             this.tbInputY = new System.Windows.Forms.TextBox();
             this.btnResh = new System.Windows.Forms.Button();
+            this.rbSH = new System.Windows.Forms.RadioButton();
+            this.rbX = new System.Windows.Forms.RadioButton();
+            this.rbE = new System.Windows.Forms.RadioButton();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.tbInputE = new System.Windows.Forms.TextBox();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -51,15 +56,15 @@ namespace WindowsFormsApp1
             // 
             // tbOutput
             // 
-            this.tbOutput.Location = new System.Drawing.Point(44, 187);
+            this.tbOutput.Location = new System.Drawing.Point(17, 210);
             this.tbOutput.Multiline = true;
             this.tbOutput.Name = "tbOutput";
-            this.tbOutput.Size = new System.Drawing.Size(270, 111);
+            this.tbOutput.Size = new System.Drawing.Size(334, 111);
             this.tbOutput.TabIndex = 1;
             // 
             // tbInputX
             // 
-            this.tbInputX.Location = new System.Drawing.Point(72, 126);
+            this.tbInputX.Location = new System.Drawing.Point(60, 121);
             this.tbInputX.Name = "tbInputX";
             this.tbInputX.Size = new System.Drawing.Size(136, 20);
             this.tbInputX.TabIndex = 2;
@@ -67,7 +72,7 @@ namespace WindowsFormsApp1
             // textBox3
             // 
             this.textBox3.Enabled = false;
-            this.textBox3.Location = new System.Drawing.Point(44, 126);
+            this.textBox3.Location = new System.Drawing.Point(32, 121);
             this.textBox3.Name = "textBox3";
             this.textBox3.Size = new System.Drawing.Size(29, 20);
             this.textBox3.TabIndex = 3;
@@ -76,7 +81,7 @@ namespace WindowsFormsApp1
             // textBox4
             // 
             this.textBox4.Enabled = false;
-            this.textBox4.Location = new System.Drawing.Point(44, 152);
+            this.textBox4.Location = new System.Drawing.Point(32, 147);
             this.textBox4.Name = "textBox4";
             this.textBox4.Size = new System.Drawing.Size(29, 20);
             this.textBox4.TabIndex = 5;
@@ -84,14 +89,15 @@ namespace WindowsFormsApp1
             // 
             // tbInputY
             // 
-            this.tbInputY.Location = new System.Drawing.Point(72, 152);
+            this.tbInputY.Location = new System.Drawing.Point(60, 147);
             this.tbInputY.Name = "tbInputY";
             this.tbInputY.Size = new System.Drawing.Size(136, 20);
             this.tbInputY.TabIndex = 4;
             // 
             // btnResh
             // 
-            this.btnResh.Location = new System.Drawing.Point(226, 126);
+            this.btnResh.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnResh.Location = new System.Drawing.Point(259, 133);
             this.btnResh.Name = "btnResh";
             this.btnResh.Size = new System.Drawing.Size(88, 49);
             this.btnResh.TabIndex = 6;
@@ -99,11 +105,65 @@ namespace WindowsFormsApp1
             this.btnResh.UseVisualStyleBackColor = true;
             this.btnResh.Click += new System.EventHandler(this.btnResh_Click);
             // 
-            // Form1
+            // rbSH
+            // 
+            this.rbSH.AutoSize = true;
+            this.rbSH.Location = new System.Drawing.Point(211, 120);
+            this.rbSH.Name = "rbSH";
+            this.rbSH.Size = new System.Drawing.Size(47, 17);
+            this.rbSH.TabIndex = 7;
+            this.rbSH.TabStop = true;
+            this.rbSH.Text = "sh(x)";
+            this.rbSH.UseVisualStyleBackColor = true;
+            // 
+            // rbX
+            // 
+            this.rbX.AutoSize = true;
+            this.rbX.Location = new System.Drawing.Point(211, 149);
+            this.rbX.Name = "rbX";
+            this.rbX.Size = new System.Drawing.Size(42, 17);
+            this.rbX.TabIndex = 8;
+            this.rbX.TabStop = true;
+            this.rbX.Text = "x^2";
+            this.rbX.UseVisualStyleBackColor = true;
+            // 
+            // rbE
+            // 
+            this.rbE.AutoSize = true;
+            this.rbE.Location = new System.Drawing.Point(211, 176);
+            this.rbE.Name = "rbE";
+            this.rbE.Size = new System.Drawing.Size(42, 17);
+            this.rbE.TabIndex = 9;
+            this.rbE.TabStop = true;
+            this.rbE.Text = "e^x";
+            this.rbE.UseVisualStyleBackColor = true;
+            // 
+            // textBox1
+            // 
+            this.textBox1.Enabled = false;
+            this.textBox1.Location = new System.Drawing.Point(32, 173);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(29, 20);
+            this.textBox1.TabIndex = 11;
+            this.textBox1.Text = "E =";
+            // 
+            // tbInputE
+            // 
+            this.tbInputE.Location = new System.Drawing.Point(60, 173);
+            this.tbInputE.Name = "tbInputE";
+            this.tbInputE.Size = new System.Drawing.Size(136, 20);
+            this.tbInputE.TabIndex = 10;
+            // 
+            // Algoritm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(364, 324);
+            this.ClientSize = new System.Drawing.Size(363, 333);
+            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.tbInputE);
+            this.Controls.Add(this.rbE);
+            this.Controls.Add(this.rbX);
+            this.Controls.Add(this.rbSH);
             this.Controls.Add(this.btnResh);
             this.Controls.Add(this.textBox4);
             this.Controls.Add(this.tbInputY);
@@ -112,8 +172,8 @@ namespace WindowsFormsApp1
             this.Controls.Add(this.tbOutput);
             this.Controls.Add(this.pictureBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.Name = "Form1";
-            this.Text = "Form1";
+            this.Name = "Algoritm";
+            this.Text = "Алгоритм";
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -129,6 +189,11 @@ namespace WindowsFormsApp1
         private System.Windows.Forms.TextBox textBox4;
         private System.Windows.Forms.TextBox tbInputY;
         private System.Windows.Forms.Button btnResh;
+        private System.Windows.Forms.RadioButton rbSH;
+        private System.Windows.Forms.RadioButton rbX;
+        private System.Windows.Forms.RadioButton rbE;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.TextBox tbInputE;
     }
 }
 

Prakt3/WindowsFormsApp1/WindowsFormsApp1/Form1.cs → Prakt3/WindowsFormsApp1/WindowsFormsApp1/Algoritm.cs

@@ -10,8 +10,26 @@ using System.Windows.Forms;
 
 namespace WindowsFormsApp1
 {
-    public partial class Form1 : Form
+    public partial class Algoritm : Form
     {
+        /// <summary>
+        /// Вычисляет f в зависимости от выбраного метода 
+        /// </summary>
+        /// <param name="x">Число вводит пользователь</param>
+        /// <param name="y">Число вводит пользователь</param>
+        /// <param name="e">Число вводит пользователь</param>
+        /// <returns>Возвращаеться число f</returns>
+        public double CalculateF(double x, double y, double e)
+        {
+            double f = 0;
+            if (rbSH.Checked == true)
+                f = (e * x) - e - (Math.Pow(x, 2));
+            if (rbX.Checked == true)
+                f = Math.Pow(x, 2);
+            if (rbE.Checked == true)
+                f = Math.Pow(e, x);
+            return f;
+        }
         /// <summary>
         /// Метод который вычисляет математическое выражение
         /// </summary>
@@ -20,6 +38,7 @@ namespace WindowsFormsApp1
             tbOutput.Clear();
             double x = 0;
             double y = 0;
+            double e = 0;
             //Обработка ошибки
             try
             {
@@ -36,7 +55,15 @@ namespace WindowsFormsApp1
             {
                 tbInputY.Text = "Ошибка";
             }
-            double f = Math.Pow(x, 2);
+            try
+            {
+                e = Convert.ToDouble(tbInputE.Text);
+            }
+            catch
+            {
+                tbInputE.Text = "Ошибка";
+            }
+            double f = CalculateF(x, y, e);
             double temp = x - y;
             double result = 0;
             if (temp == 0)
@@ -59,7 +86,7 @@ namespace WindowsFormsApp1
             tbOutput.Text += "C = " + result;
         }
 
-        public Form1()
+        public Algoritm()
         {
             InitializeComponent();
         }

Prakt3/WindowsFormsApp1/WindowsFormsApp1/Program.cs

@@ -16,7 +16,7 @@ namespace WindowsFormsApp1
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Form1());
+            Application.Run(new Algoritm());
         }
     }
 }

Prakt3/WindowsFormsApp1/WindowsFormsApp1/WindowsFormsApp1.csproj

@@ -46,16 +46,16 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Form1.cs">
+    <Compile Include="Algoritm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <Compile Include="Algoritm.Designer.cs">
+      <DependentUpon>Algoritm.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <EmbeddedResource Include="Algoritm.resx">
+      <DependentUpon>Algoritm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

Prakt3/WindowsFormsApp1/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-8069502011d0681850e57a53d5a1673222f430a6
+bb572adee6968f02ac85533931ef85befea15cd9

Prakt3/WindowsFormsApp1/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt

@@ -2,9 +2,9 @@ C:\Users\user\Desktop\git\Prakt3\WindowsFormsApp1\WindowsFormsApp1\bin\Debug\Win
 C:\Users\user\Desktop\git\Prakt3\WindowsFormsApp1\WindowsFormsApp1\bin\Debug\WindowsFormsApp1.exe
 C:\Users\user\Desktop\git\Prakt3\WindowsFormsApp1\WindowsFormsApp1\bin\Debug\WindowsFormsApp1.pdb
 C:\Users\user\Desktop\git\Prakt3\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.csproj.AssemblyReference.cache
-C:\Users\user\Desktop\git\Prakt3\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.Form1.resources
 C:\Users\user\Desktop\git\Prakt3\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.Properties.Resources.resources
 C:\Users\user\Desktop\git\Prakt3\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.csproj.GenerateResource.cache
 C:\Users\user\Desktop\git\Prakt3\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.csproj.CoreCompileInputs.cache
 C:\Users\user\Desktop\git\Prakt3\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.exe
 C:\Users\user\Desktop\git\Prakt3\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.pdb
+C:\Users\user\Desktop\git\Prakt3\WindowsFormsApp1\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.Algoritm.resources