@@ -28,6 +28,7 @@ namespace MethodsGenerationNumber {
2828 this ->dg_equability ->Rows [1 ]->HeaderCell ->Value = " Ìåò 2" ;
2929 this ->dg_equability ->Rows ->Add ();
3030 this ->dg_equability ->Rows [2 ]->HeaderCell ->Value = " Ìåò 3" ;
31+
3132 }
3233
3334 protected:
@@ -99,11 +100,11 @@ namespace MethodsGenerationNumber {
99100 // / </summary>
100101 void InitializeComponent (void )
101102 {
102- System::Windows::Forms::DataVisualization::Charting::ChartArea^ chartArea2 = (gcnew System::Windows::Forms::DataVisualization::Charting::ChartArea ());
103- System::Windows::Forms::DataVisualization::Charting::Legend^ legend2 = (gcnew System::Windows::Forms::DataVisualization::Charting::Legend ());
104- System::Windows::Forms::DataVisualization::Charting::Series^ series4 = (gcnew System::Windows::Forms::DataVisualization::Charting::Series ());
105- System::Windows::Forms::DataVisualization::Charting::Series^ series5 = (gcnew System::Windows::Forms::DataVisualization::Charting::Series ());
106- System::Windows::Forms::DataVisualization::Charting::Series^ series6 = (gcnew System::Windows::Forms::DataVisualization::Charting::Series ());
103+ System::Windows::Forms::DataVisualization::Charting::ChartArea^ chartArea1 = (gcnew System::Windows::Forms::DataVisualization::Charting::ChartArea ());
104+ System::Windows::Forms::DataVisualization::Charting::Legend^ legend1 = (gcnew System::Windows::Forms::DataVisualization::Charting::Legend ());
105+ System::Windows::Forms::DataVisualization::Charting::Series^ series1 = (gcnew System::Windows::Forms::DataVisualization::Charting::Series ());
106+ System::Windows::Forms::DataVisualization::Charting::Series^ series2 = (gcnew System::Windows::Forms::DataVisualization::Charting::Series ());
107+ System::Windows::Forms::DataVisualization::Charting::Series^ series3 = (gcnew System::Windows::Forms::DataVisualization::Charting::Series ());
107108 System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager (GenerationForm::typeid ));
108109 this ->chart1 = (gcnew System::Windows::Forms::DataVisualization::Charting::Chart ());
109110 this ->btn_squre = (gcnew System::Windows::Forms::Button ());
@@ -139,64 +140,66 @@ namespace MethodsGenerationNumber {
139140 // chart1
140141 //
141142 this ->chart1 ->BackColor = System::Drawing::Color::SkyBlue;
142- chartArea2 ->AlignmentOrientation = static_cast <System::Windows::Forms::DataVisualization::Charting::AreaAlignmentOrientations>((System::Windows::Forms::DataVisualization::Charting::AreaAlignmentOrientations::Vertical | System::Windows::Forms::DataVisualization::Charting::AreaAlignmentOrientations::Horizontal));
143- chartArea2 ->AxisX ->IntervalAutoMode = System::Windows::Forms::DataVisualization::Charting::IntervalAutoMode::VariableCount;
144- chartArea2 ->AxisX ->IsMarginVisible = false ;
145- chartArea2 ->AxisX ->MajorGrid ->Enabled = false ;
146- chartArea2 ->AxisX ->MajorTickMark ->Enabled = false ;
147- chartArea2 ->AxisY ->IntervalAutoMode = System::Windows::Forms::DataVisualization::Charting::IntervalAutoMode::VariableCount;
148- chartArea2 ->AxisY ->LabelStyle ->Format = L" 0" ;
149- chartArea2 ->AxisY ->MajorGrid ->Interval = 0 ;
150- chartArea2 ->AxisY ->MajorGrid ->IntervalOffset = 0 ;
151- chartArea2 ->AxisY ->MaximumAutoSize = 100 ;
152- chartArea2 ->AxisY ->Minimum = 0 ;
153- chartArea2 ->AxisY ->Title = L" Êîëè÷åñòâî" ;
154- chartArea2 ->AxisY ->TitleFont = (gcnew System::Drawing::Font (L" Microsoft Sans Serif" , 9 .75F , System::Drawing::FontStyle::Regular,
143+ chartArea1 ->AlignmentOrientation = static_cast <System::Windows::Forms::DataVisualization::Charting::AreaAlignmentOrientations>((System::Windows::Forms::DataVisualization::Charting::AreaAlignmentOrientations::Vertical | System::Windows::Forms::DataVisualization::Charting::AreaAlignmentOrientations::Horizontal));
144+ chartArea1 ->AxisX ->IntervalAutoMode = System::Windows::Forms::DataVisualization::Charting::IntervalAutoMode::VariableCount;
145+ chartArea1 ->AxisX ->IsMarginVisible = false ;
146+ chartArea1 ->AxisX ->MajorGrid ->Enabled = false ;
147+ chartArea1 ->AxisX ->MajorTickMark ->Enabled = false ;
148+ chartArea1 ->AxisY ->IntervalAutoMode = System::Windows::Forms::DataVisualization::Charting::IntervalAutoMode::VariableCount;
149+ chartArea1 ->AxisY ->LabelStyle ->Format = L" 0" ;
150+ chartArea1 ->AxisY ->MajorGrid ->Interval = 0 ;
151+ chartArea1 ->AxisY ->MajorGrid ->IntervalOffset = 0 ;
152+ chartArea1 ->AxisY ->MaximumAutoSize = 100 ;
153+ chartArea1 ->AxisY ->Minimum = 0 ;
154+ chartArea1 ->AxisY ->Title = L" Êîëè÷åñòâî" ;
155+ chartArea1 ->AxisY ->TitleFont = (gcnew System::Drawing::Font (L" Microsoft Sans Serif" , 9 .75F , System::Drawing::FontStyle::Regular,
155156 System::Drawing::GraphicsUnit::Point, static_cast <System::Byte>(204 )));
156- chartArea2 ->BackColor = System::Drawing::Color::FromArgb (static_cast <System::Int32>(static_cast <System::Byte>(255 )), static_cast <System::Int32>(static_cast <System::Byte>(255 )),
157+ chartArea1 ->BackColor = System::Drawing::Color::FromArgb (static_cast <System::Int32>(static_cast <System::Byte>(255 )), static_cast <System::Int32>(static_cast <System::Byte>(255 )),
157158 static_cast <System::Int32>(static_cast <System::Byte>(192 )));
158- chartArea2 ->Name = L" ChartArea1" ;
159- this ->chart1 ->ChartAreas ->Add (chartArea2 );
160- legend2 ->BackColor = System::Drawing::Color::Transparent;
161- legend2 ->DockedToChartArea = L" ChartArea1" ;
162- legend2 ->Font = (gcnew System::Drawing::Font (L" Microsoft Sans Serif" , 8 .25F , System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
159+ chartArea1 ->Name = L" ChartArea1" ;
160+ this ->chart1 ->ChartAreas ->Add (chartArea1 );
161+ legend1 ->BackColor = System::Drawing::Color::Transparent;
162+ legend1 ->DockedToChartArea = L" ChartArea1" ;
163+ legend1 ->Font = (gcnew System::Drawing::Font (L" Microsoft Sans Serif" , 8 .25F , System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
163164 static_cast <System::Byte>(204 )));
164- legend2 ->IsTextAutoFit = false ;
165- legend2 ->Name = L" Legend1" ;
166- this ->chart1 ->Legends ->Add (legend2 );
165+ legend1 ->IsTextAutoFit = false ;
166+ legend1 ->Name = L" Legend1" ;
167+ this ->chart1 ->Legends ->Add (legend1 );
167168 this ->chart1 ->Location = System::Drawing::Point (12 , 12 );
168169 this ->chart1 ->Name = L" chart1" ;
169- series4 ->ChartArea = L" ChartArea1" ;
170- series4 ->Color = System::Drawing::Color::FromArgb (static_cast <System::Int32>(static_cast <System::Byte>(0 )), static_cast <System::Int32>(static_cast <System::Byte>(192 )),
170+ series1 ->ChartArea = L" ChartArea1" ;
171+ series1 ->Color = System::Drawing::Color::FromArgb (static_cast <System::Int32>(static_cast <System::Byte>(0 )), static_cast <System::Int32>(static_cast <System::Byte>(192 )),
171172 static_cast <System::Int32>(static_cast <System::Byte>(192 )));
172- series4->Font = (gcnew System::Drawing::Font (L" Microsoft Sans Serif" , 9 .75F , System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
173+ series1->EmptyPointStyle ->CustomProperties = L" DrawingStyle=Cylinder" ;
174+ series1->Font = (gcnew System::Drawing::Font (L" Microsoft Sans Serif" , 9 .75F , System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
173175 static_cast <System::Byte>(204 )));
174- series4->IsValueShownAsLabel = true ;
175- series4->Legend = L" Legend1" ;
176- series4->Name = L" Ìåòîä ñåðèäèííûõ îòðåçêîâ" ;
177- series4->XValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::String;
178- series4->YValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::UInt64;
179- series5->ChartArea = L" ChartArea1" ;
180- series5->Color = System::Drawing::Color::Red;
181- series5->Font = (gcnew System::Drawing::Font (L" Microsoft Sans Serif" , 9 .75F , System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
176+ series1->IsValueShownAsLabel = true ;
177+ series1->Legend = L" Legend1" ;
178+ series1->Name = L" Ìåòîä ñåðèäèííûõ îòðåçêîâ" ;
179+ series1->XValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::String;
180+ series1->YValuesPerPoint = 2 ;
181+ series1->YValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::UInt64;
182+ series2->ChartArea = L" ChartArea1" ;
183+ series2->Color = System::Drawing::Color::Red;
184+ series2->Font = (gcnew System::Drawing::Font (L" Microsoft Sans Serif" , 9 .75F , System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
182185 static_cast <System::Byte>(204 )));
183- series5 ->IsValueShownAsLabel = true ;
184- series5 ->Legend = L" Legend1" ;
185- series5 ->Name = L" Ìåòîä ïðîèçâåäåíèé" ;
186- series5 ->XValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::String;
187- series5 ->YValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::UInt64;
188- series6 ->ChartArea = L" ChartArea1" ;
189- series6 ->Color = System::Drawing::Color::Indigo;
190- series6 ->Font = (gcnew System::Drawing::Font (L" Microsoft Sans Serif" , 9 , System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
186+ series2 ->IsValueShownAsLabel = true ;
187+ series2 ->Legend = L" Legend1" ;
188+ series2 ->Name = L" Ìåòîä ïðîèçâåäåíèé" ;
189+ series2 ->XValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::String;
190+ series2 ->YValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::UInt64;
191+ series3 ->ChartArea = L" ChartArea1" ;
192+ series3 ->Color = System::Drawing::Color::Indigo;
193+ series3 ->Font = (gcnew System::Drawing::Font (L" Microsoft Sans Serif" , 9 , System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
191194 static_cast <System::Byte>(204 )));
192- series6 ->IsValueShownAsLabel = true ;
193- series6 ->Legend = L" Legend1" ;
194- series6 ->Name = L" Êîíãðóýòíûé ìåòîä" ;
195- series6 ->XValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::String;
196- series6 ->YValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::UInt64;
197- this ->chart1 ->Series ->Add (series4 );
198- this ->chart1 ->Series ->Add (series5 );
199- this ->chart1 ->Series ->Add (series6 );
195+ series3 ->IsValueShownAsLabel = true ;
196+ series3 ->Legend = L" Legend1" ;
197+ series3 ->Name = L" Êîíãðóýòíûé ìåòîä" ;
198+ series3 ->XValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::String;
199+ series3 ->YValueType = System::Windows::Forms::DataVisualization::Charting::ChartValueType::UInt64;
200+ this ->chart1 ->Series ->Add (series1 );
201+ this ->chart1 ->Series ->Add (series2 );
202+ this ->chart1 ->Series ->Add (series3 );
200203 this ->chart1 ->Size = System::Drawing::Size (734 , 345 );
201204 this ->chart1 ->TabIndex = 0 ;
202205 this ->chart1 ->Text = L" chart1" ;
@@ -339,7 +342,7 @@ namespace MethodsGenerationNumber {
339342 //
340343 this ->dg_data ->AllowUserToAddRows = false ;
341344 this ->dg_data ->AllowUserToDeleteRows = false ;
342- this ->dg_data ->AutoSizeColumnsMode = System::Windows::Forms::DataGridViewAutoSizeColumnsMode::AllCellsExceptHeader ;
345+ this ->dg_data ->AutoSizeColumnsMode = System::Windows::Forms::DataGridViewAutoSizeColumnsMode::Fill ;
343346 this ->dg_data ->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders;
344347 this ->dg_data ->BorderStyle = System::Windows::Forms::BorderStyle::None;
345348 this ->dg_data ->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize;
@@ -350,7 +353,7 @@ namespace MethodsGenerationNumber {
350353 this ->dg_data ->Location = System::Drawing::Point (752 , 12 );
351354 this ->dg_data ->Name = L" dg_data" ;
352355 this ->dg_data ->ReadOnly = true ;
353- this ->dg_data ->Size = System::Drawing::Size (240 , 150 );
356+ this ->dg_data ->Size = System::Drawing::Size (281 , 150 );
354357 this ->dg_data ->TabIndex = 23 ;
355358 //
356359 // current
@@ -359,29 +362,26 @@ namespace MethodsGenerationNumber {
359362 this ->current ->Name = L" current" ;
360363 this ->current ->ReadOnly = true ;
361364 this ->current ->SortMode = System::Windows::Forms::DataGridViewColumnSortMode::NotSortable;
362- this ->current ->Width = 5 ;
363365 //
364366 // reultMult
365367 //
366368 this ->reultMult ->HeaderText = L" Ðåçóëüòàò óìíîæåíèÿ" ;
367369 this ->reultMult ->Name = L" reultMult" ;
368370 this ->reultMult ->ReadOnly = true ;
369371 this ->reultMult ->SortMode = System::Windows::Forms::DataGridViewColumnSortMode::NotSortable;
370- this ->reultMult ->Width = 5 ;
371372 //
372373 // recieved
373374 //
374375 this ->recieved ->HeaderText = L" Ïîëó÷åííîå" ;
375376 this ->recieved ->Name = L" recieved" ;
376377 this ->recieved ->ReadOnly = true ;
377378 this ->recieved ->SortMode = System::Windows::Forms::DataGridViewColumnSortMode::NotSortable;
378- this ->recieved ->Width = 5 ;
379379 //
380380 // dg_equability
381381 //
382382 this ->dg_equability ->AllowUserToAddRows = false ;
383383 this ->dg_equability ->AllowUserToDeleteRows = false ;
384- this ->dg_equability ->AutoSizeColumnsMode = System::Windows::Forms::DataGridViewAutoSizeColumnsMode::AllCellsExceptHeader ;
384+ this ->dg_equability ->AutoSizeColumnsMode = System::Windows::Forms::DataGridViewAutoSizeColumnsMode::Fill ;
385385 this ->dg_equability ->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders;
386386 this ->dg_equability ->BorderStyle = System::Windows::Forms::BorderStyle::None;
387387 this ->dg_equability ->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize;
@@ -392,7 +392,7 @@ namespace MethodsGenerationNumber {
392392 this ->dg_equability ->Location = System::Drawing::Point (752 , 168 );
393393 this ->dg_equability ->Name = L" dg_equability" ;
394394 this ->dg_equability ->ReadOnly = true ;
395- this ->dg_equability ->Size = System::Drawing::Size (240 , 150 );
395+ this ->dg_equability ->Size = System::Drawing::Size (281 , 150 );
396396 this ->dg_equability ->TabIndex = 24 ;
397397 //
398398 // met1
@@ -401,23 +401,20 @@ namespace MethodsGenerationNumber {
401401 this ->met1 ->Name = L" met1" ;
402402 this ->met1 ->ReadOnly = true ;
403403 this ->met1 ->SortMode = System::Windows::Forms::DataGridViewColumnSortMode::NotSortable;
404- this ->met1 ->Width = 5 ;
405404 //
406405 // met2
407406 //
408407 this ->met2 ->HeaderText = L" Äèñïåðñèÿ" ;
409408 this ->met2 ->Name = L" met2" ;
410409 this ->met2 ->ReadOnly = true ;
411410 this ->met2 ->SortMode = System::Windows::Forms::DataGridViewColumnSortMode::NotSortable;
412- this ->met2 ->Width = 5 ;
413411 //
414412 // met3
415413 //
416414 this ->met3 ->HeaderText = L" Ñðåäíåêâàäðàòè÷íîå îòêëîíåíèå" ;
417415 this ->met3 ->Name = L" met3" ;
418416 this ->met3 ->ReadOnly = true ;
419417 this ->met3 ->SortMode = System::Windows::Forms::DataGridViewColumnSortMode::NotSortable;
420- this ->met3 ->Width = 5 ;
421418 //
422419 // lbl_intervalTest2
423420 //
@@ -481,6 +478,7 @@ namespace MethodsGenerationNumber {
481478 System::Void clearDataGrid_data ();
482479 System::Void fillDataGrid (__int64 curNumb, __int64 squareCurNumb, __int64 receivedNumb);
483480 System::Void fillDataGridEquability (int const & method, double expectedValue, double dispersion, double standardDeviation);
481+ System::Void fillIntervalTest (int method,double expectedValue, double dispersion, double standart);
484482 void fillDiagram (int series, int * countPointsInDiapason);
485483 // methods
486484 std::vector<double > methodOfMeanSquares (int countPoints, __int64 R0);
0 commit comments