Skip to content

Commit 76de799

Browse files
#TDP - 17 Fixed bug with cutNumber
1 parent d21de39 commit 76de799

File tree

2 files changed

+131
-4
lines changed

2 files changed

+131
-4
lines changed

MethodsGenerationNumber/GenerationForm.cpp

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "GenerationForm.h"
2-
2+
#include <fstream>
33
using namespace System;
44
using namespace System::Windows::Forms;
55

@@ -126,8 +126,9 @@ double cutNumber(int posNumbers,__int64 numbers,int const& start,int const& end)
126126

127127
std::vector<double> MethodsGenerationNumber::GenerationForm::methodOfMeanSquares(int countPoints,__int64 R0)
128128
{
129-
std::vector<double> randNumb;
130129

130+
std::vector<double> randNumb;
131+
std::ofstream file("log.txt");
131132
for (int i = 0; i < countPoints; i++)
132133
{
133134
__int64 R1 = R0 * R0;
@@ -137,17 +138,23 @@ std::vector<double> MethodsGenerationNumber::GenerationForm::methodOfMeanSquares
137138
R3 = cutNumber(8, R1, 2, 6);
138139
else
139140
if (R1 > 100000)
140-
R3 = cutNumber(7, R1, 1, 6);
141+
R3 = cutNumber(7, R1, 2, 6);
141142
else
142143
if (R1 > 10000)
143144
R3 = cutNumber(6, R1, 0, 5);
144145
else
145146
R3 = R1;
147+
148+
file << i << ": R0 = " << R0 << "; R1" << R1 << "; R3" << R3 << std::endl;
149+
146150
if(i<10)
147151
fillDataGrid(R0, R1, R3);
148152
R0 = R3;
153+
149154
randNumb.push_back(R3/10000.0);
155+
150156
}
157+
file.close();
151158
return randNumb;
152159
}
153160

@@ -162,7 +169,7 @@ std::vector<double> MethodsGenerationNumber::GenerationForm::methodOfMult(int co
162169
temp = cutNumber(8, R3, 2, 6);
163170
else
164171
if (R3 > 100000)
165-
temp = cutNumber(7, R3, 1, 6);
172+
temp = cutNumber(7, R3, 2, 6);
166173
else
167174
if (R3 > 10000)
168175
temp = cutNumber(6, R3, 0, 5);

MethodsGenerationNumber/log.txt

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
0: R0 = 7153; R151165409; R31654
2+
1: R0 = 1654; R12735716; R37357
3+
2: R0 = 7357; R154125449; R31254
4+
3: R0 = 1254; R11572516; R35725
5+
4: R0 = 5725; R132775625; R37756
6+
5: R0 = 7756; R160155536; R31555
7+
6: R0 = 1555; R12418025; R34180
8+
7: R0 = 4180; R117472400; R34724
9+
8: R0 = 4724; R122316176; R33161
10+
9: R0 = 3161; R19991921; R39919
11+
10: R0 = 9919; R198386561; R33865
12+
11: R0 = 3865; R114938225; R39382
13+
12: R0 = 9382; R188021924; R3219
14+
13: R0 = 219; R147961; R34796
15+
14: R0 = 4796; R123001616; R316
16+
15: R0 = 16; R1256; R3256
17+
16: R0 = 256; R165536; R36553
18+
17: R0 = 6553; R142941809; R39418
19+
18: R0 = 9418; R188698724; R36987
20+
19: R0 = 6987; R148818169; R38181
21+
20: R0 = 8181; R166928761; R39287
22+
21: R0 = 9287; R186248369; R32483
23+
22: R0 = 2483; R16165289; R31652
24+
23: R0 = 1652; R12729104; R37291
25+
24: R0 = 7291; R153158681; R31586
26+
25: R0 = 1586; R12515396; R35153
27+
26: R0 = 5153; R126553409; R35534
28+
27: R0 = 5534; R130625156; R36251
29+
28: R0 = 6251; R139075001; R3750
30+
29: R0 = 750; R1562500; R36250
31+
30: R0 = 6250; R139062500; R3625
32+
31: R0 = 625; R1390625; R39062
33+
32: R0 = 9062; R182119844; R31198
34+
33: R0 = 1198; R11435204; R34352
35+
34: R0 = 4352; R118939904; R39399
36+
35: R0 = 9399; R188341201; R33412
37+
36: R0 = 3412; R111641744; R36417
38+
37: R0 = 6417; R141177889; R31778
39+
38: R0 = 1778; R13161284; R31612
40+
39: R0 = 1612; R12598544; R35985
41+
40: R0 = 5985; R135820225; R38202
42+
41: R0 = 8202; R167272804; R32728
43+
42: R0 = 2728; R17441984; R34419
44+
43: R0 = 4419; R119527561; R35275
45+
44: R0 = 5275; R127825625; R38256
46+
45: R0 = 8256; R168161536; R31615
47+
46: R0 = 1615; R12608225; R36082
48+
47: R0 = 6082; R136990724; R39907
49+
48: R0 = 9907; R198148649; R31486
50+
49: R0 = 1486; R12208196; R32081
51+
50: R0 = 2081; R14330561; R33305
52+
51: R0 = 3305; R110923025; R39230
53+
52: R0 = 9230; R185192900; R31929
54+
53: R0 = 1929; R13721041; R37210
55+
54: R0 = 7210; R151984100; R39841
56+
55: R0 = 9841; R196845281; R38452
57+
56: R0 = 8452; R171436304; R34363
58+
57: R0 = 4363; R119035769; R3357
59+
58: R0 = 357; R1127449; R32744
60+
59: R0 = 2744; R17529536; R35295
61+
60: R0 = 5295; R128037025; R3370
62+
61: R0 = 370; R1136900; R33690
63+
62: R0 = 3690; R113616100; R36161
64+
63: R0 = 6161; R137957921; R39579
65+
64: R0 = 9579; R191757241; R37572
66+
65: R0 = 7572; R157335184; R33351
67+
66: R0 = 3351; R111229201; R32292
68+
67: R0 = 2292; R15253264; R32532
69+
68: R0 = 2532; R16411024; R34110
70+
69: R0 = 4110; R116892100; R38921
71+
70: R0 = 8921; R179584241; R35842
72+
71: R0 = 5842; R134128964; R31289
73+
72: R0 = 1289; R11661521; R36615
74+
73: R0 = 6615; R143758225; R37582
75+
74: R0 = 7582; R157486724; R34867
76+
75: R0 = 4867; R123687689; R36876
77+
76: R0 = 6876; R147279376; R32793
78+
77: R0 = 2793; R17800849; R38008
79+
78: R0 = 8008; R164128064; R31280
80+
79: R0 = 1280; R11638400; R36384
81+
80: R0 = 6384; R140755456; R37554
82+
81: R0 = 7554; R157062916; R3629
83+
82: R0 = 629; R1395641; R39564
84+
83: R0 = 9564; R191470096; R34700
85+
84: R0 = 4700; R122090000; R3900
86+
85: R0 = 900; R1810000; R31000
87+
86: R0 = 1000; R11000000; R30
88+
87: R0 = 0; R10; R30
89+
88: R0 = 0; R10; R30
90+
89: R0 = 0; R10; R30
91+
90: R0 = 0; R10; R30
92+
91: R0 = 0; R10; R30
93+
92: R0 = 0; R10; R30
94+
93: R0 = 0; R10; R30
95+
94: R0 = 0; R10; R30
96+
95: R0 = 0; R10; R30
97+
96: R0 = 0; R10; R30
98+
97: R0 = 0; R10; R30
99+
98: R0 = 0; R10; R30
100+
99: R0 = 0; R10; R30
101+
100: R0 = 0; R10; R30
102+
101: R0 = 0; R10; R30
103+
102: R0 = 0; R10; R30
104+
103: R0 = 0; R10; R30
105+
104: R0 = 0; R10; R30
106+
105: R0 = 0; R10; R30
107+
106: R0 = 0; R10; R30
108+
107: R0 = 0; R10; R30
109+
108: R0 = 0; R10; R30
110+
109: R0 = 0; R10; R30
111+
110: R0 = 0; R10; R30
112+
111: R0 = 0; R10; R30
113+
112: R0 = 0; R10; R30
114+
113: R0 = 0; R10; R30
115+
114: R0 = 0; R10; R30
116+
115: R0 = 0; R10; R30
117+
116: R0 = 0; R10; R30
118+
117: R0 = 0; R10; R30
119+
118: R0 = 0; R10; R30
120+
119: R0 = 0; R10; R30

0 commit comments

Comments
 (0)