#TDP - 11 Fixed bug

1. accuracy up to two characters
2. Delete point to line tringle

Author: StrongerProgrammer7

MethodMonte_Karlo/InteractionForm.cpp

@@ -143,10 +143,11 @@ System::Void MethodMonteKarlo::InteractionForm::Btn_squareTringle(System::Object
 			 this->chart1->Series[3]->Points->AddXY(rnd_x[i], rnd_y[i]);
 	 }
 	 double squareFigure = (M * a * b) / N;
-	 this->label_squareTringle->Text = "Ïëîùàäü: " +  squareFigure.ToString();
-	 this->label_checkSquare->Text = " Ïðîâåðêà: " + (0.5 * abs((triangleVertexCoord ["xc"]- triangleVertexCoord["xa"])*
-		 (triangleVertexCoord["yb"]- triangleVertexCoord["ya"])-(triangleVertexCoord["xb"]- triangleVertexCoord["xa"])
-		 *(triangleVertexCoord["yc"]- triangleVertexCoord["ya"]))).ToString();
+	 double squareTringle = (0.5 * abs((triangleVertexCoord["xc"] - triangleVertexCoord["xa"]) *
+		 (triangleVertexCoord["yb"] - triangleVertexCoord["ya"]) - (triangleVertexCoord["xb"] - triangleVertexCoord["xa"])
+		 * (triangleVertexCoord["yc"] - triangleVertexCoord["ya"])));
+	 this->label_squareTringle->Text = "Ïëîùàäü: " +  (int((squareFigure) * 1000 + 0.5) / 1000.0).ToString();
+	 this->label_checkSquare->Text = " Òî÷íîå çíà÷åíèå: " + (int((squareTringle) * 1000 + 0.5) / 1000.0).ToString();
 }
 
 System::Void MethodMonteKarlo::InteractionForm::Btn_squareIntegral_Click(System::Object^ sender, System::EventArgs^ e)
@@ -205,8 +206,8 @@ System::Void MethodMonteKarlo::InteractionForm::Btn_squareIntegral_Click(System:
 			this->chart1->Series[6]->Points->AddXY(rnd_x[i], rnd_y[i]);
 	}
 	double integral = (M * a * b) / N;
-	this->label_integral->Text = "Èíòåãðàë: " + integral.ToString();
-	this->label_checkIntegral->Text = " Ñèìïñîí: " + method_Sympsona(0.0, a, N, numVar, false);//method_LeftRectangle(0.0, a, N).ToString();
+	this->label_integral->Text = "Èíòåãðàë: " + (int((integral) * 1000 + 0.5) / 1000.0).ToString();
+	this->label_checkIntegral->Text = " Ñèìïñîí: " + (int((method_Sympsona(0.0, a, N, numVar, false)) * 1000 + 0.5) / 1000.0);//method_LeftRectangle(0.0, a, N).ToString();
 }
 
 System::Void MethodMonteKarlo::InteractionForm::ToolStripMenuItem_openForm2_Click(System::Object^ sender, System::EventArgs^ e)

MethodMonte_Karlo/InteractionForm.h

@@ -312,7 +312,6 @@ namespace MethodMonteKarlo {
 				static_cast<System::Byte>(204)));
 			series1->Legend = L"Legend1";
 			series1->MarkerColor = System::Drawing::Color::Red;
-			series1->MarkerStyle = System::Windows::Forms::DataVisualization::Charting::MarkerStyle::Square;
 			series1->Name = L"Ôèãóðà";
 			series2->BorderWidth = 2;
 			series2->ChartArea = L"ChartArea1";
@@ -343,12 +342,11 @@ namespace MethodMonteKarlo {
 			series4->Name = L"Òî÷êè ñíàðóæè";
 			series5->BorderWidth = 2;
 			series5->ChartArea = L"ChartArea2";
-			series5->ChartType = System::Windows::Forms::DataVisualization::Charting::SeriesChartType::SplineArea;
+			series5->ChartType = System::Windows::Forms::DataVisualization::Charting::SeriesChartType::Spline;
 			series5->Color = System::Drawing::Color::Transparent;
 			series5->Legend = L"Legend2";
 			series5->MarkerColor = System::Drawing::Color::FromArgb(static_cast<System::Int32>(static_cast<System::Byte>(192)), static_cast<System::Int32>(static_cast<System::Byte>(0)),
 				static_cast<System::Int32>(static_cast<System::Byte>(0)));
-			series5->MarkerStyle = System::Windows::Forms::DataVisualization::Charting::MarkerStyle::Circle;
 			series5->Name = L"Ôèãóðà-2";
 			series5->Palette = System::Windows::Forms::DataVisualization::Charting::ChartColorPalette::Grayscale;
 			series5->YValuesPerPoint = 2;

MethodMonte_Karlo/InteractiveForm2.cpp

@@ -42,7 +42,7 @@ System::Void MethodMonteKarlo::InteractiveForm2::Button1_Click(System::Object^ s
 	double squareCicle = 4 * M / N;
 	this->label_pi->Text = "ÏÈ : " + (std::_Pi).ToString();
 	this->label_squareSquare->Text = "Ïëîùàäü êâàäðàòà : " + (squareSquare).ToString();
-	this->label_squareCicle->Text = "Ïëîùàäü êðóãà : " + (squareCicle).ToString();
+	this->label_squareCicle->Text = "Ïëîùàäü êðóãà : " + (int((squareCicle) * 1000 + 0.5) / 1000.0).ToString();
 }
 
 void MethodMonteKarlo::InteractiveForm2::clearInteractiveElementChartArea1()
@@ -134,10 +134,11 @@ System::Void MethodMonteKarlo::InteractiveForm2::Btn_polar_Click(System::Object^
 		else
 			this->chart1->Series[7]->Points->AddXY(rnd_x[i], rnd_y[i]);
 	}
-
-	this->label_squareFigure->Text = "Ïëîùàäü ôèãóðû " + (M * (max_a * max_b * 4.0) / N).ToString();
-	this->label_check1->Text = "PI/2 *(" +A.ToString() + " + " + B.ToString() +") " + ((std::_Pi/2.0) * (A + B)).ToString();
-	this->label_checkIntegral->Text = "Èíòåãðàë: " +(0.5*(method_Sympsona(0,std::_Pi*2.0,N,numVar,true))).ToString();
+	double squireFigure = int(((M * (max_a * max_b * 4.0) / N)) * 1000 + 0.5) / 1000.0;
+	double accu = int((0.5 * (method_Sympsona(0, std::_Pi * 2.0, N, numVar, true))) * 1000 + 0.5) / 1000.0;
+	this->label_squareFigure->Text = "Ïëîùàäü ôèãóðû " + squireFigure.ToString();//(M * (max_a * max_b * 4.0) / N).ToString();
+	this->label_check1->Text = "PI/2 *(" +A.ToString() + " + " + B.ToString() +") " + (int(((std::_Pi / 2.0) * (A + B)) * 1000 + 0.5) / 1000.0).ToString();
+	this->label_checkIntegral->Text = "Òî÷íîå çíà÷åíèå: " + accu.ToString();//(0.5*(method_Sympsona(0,std::_Pi*2.0,N,numVar,true))).ToString();
 	//this->label_checkIntegral->Text += "   LEFT " + (0.5*(method_LeftRectangle(0,std::_Pi*2.0,N))).ToString();
 }
 

MethodMonte_Karlo/InteractiveForm2.h

@@ -370,7 +370,7 @@ namespace MethodMonteKarlo {
 			// label_check1
 			// 
 			this->label_check1->AutoSize = true;
-			this->label_check1->Location = System::Drawing::Point(650, 191);
+			this->label_check1->Location = System::Drawing::Point(650, 290);
 			this->label_check1->Name = L"label_check1";
 			this->label_check1->Size = System::Drawing::Size(112, 13);
 			this->label_check1->TabIndex = 13;
@@ -429,7 +429,7 @@ namespace MethodMonteKarlo {
 			// label_checkIntegral
 			// 
 			this->label_checkIntegral->AutoSize = true;
-			this->label_checkIntegral->Location = System::Drawing::Point(650, 222);
+			this->label_checkIntegral->Location = System::Drawing::Point(650, 197);
 			this->label_checkIntegral->Name = L"label_checkIntegral";
 			this->label_checkIntegral->Size = System::Drawing::Size(55, 13);
 			this->label_checkIntegral->TabIndex = 18;