test existing implementation (#3017)

This commit is contained in:
Matthew Kennedy 2021-07-21 14:48:37 -07:00 committed by GitHub
parent f2cb242090
commit b9f141256a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1441 additions and 9 deletions

View File

@ -0,0 +1,385 @@
Time [s],crank,cam
0.000000000,0,0
1.564359833,1,0
1.575405167,0,0
1.691305333,1,0
1.695809167,0,0
1.781376250,0,1
1.802194167,1,1
1.805902917,0,1
1.818287000,0,0
1.876171250,1,0
1.880239667,0,0
1.956382417,1,0
1.959712417,0,0
2.021044583,1,0
2.024797500,0,0
2.059558583,0,1
2.072814583,0,0
2.082386833,0,1
2.093364083,1,1
2.109644417,1,0
2.148812417,0,0
2.152125083,1,0
2.155911500,0,0
2.225955417,1,0
2.229369583,0,0
2.286644417,1,0
2.290199167,0,0
2.347494667,0,1
2.358203250,1,1
2.412384417,0,1
2.415629500,1,1
2.419386417,0,1
2.486860333,1,1
2.542413333,0,1
2.545543917,1,1
2.549017167,0,1
2.559069750,0,0
2.582399583,0,1
2.595386417,0,0
2.604812500,0,1
2.615566667,1,1
2.633051833,1,0
2.669346167,0,0
2.672590750,1,0
2.676287333,0,0
2.742344833,1,0
2.796466833,0,0
2.799672250,1,0
2.803189917,0,0
2.858015417,0,1
2.868454417,1,1
2.921197333,0,1
2.924384250,1,1
2.928094000,0,1
2.994312833,1,1
3.048448500,0,1
3.051726167,1,1
3.055255167,0,1
3.064572167,0,0
3.087696250,0,1
3.100520250,0,0
3.109771000,0,1
3.120470917,1,1
3.137033917,1,0
3.173488833,0,0
3.176730250,1,0
3.180492167,0,0
3.246366417,1,0
3.300527917,0,0
3.303774167,1,0
3.307322750,0,0
3.362247500,0,1
3.372859917,1,1
3.375890083,0,1
3.429460250,1,1
3.433188333,0,1
3.473809500,1,1
3.491902000,0,1
3.492960500,1,1
3.497116583,1,0
3.507737250,1,1
3.514072917,1,0
3.519061000,1,1
3.523271917,0,1
3.524285000,1,1
3.544917417,0,1
3.546180333,1,1
3.581912833,0,1
3.583091250,1,1
3.608697750,0,1
3.610380083,1,1
3.635820750,1,0
3.649447000,1,1
3.655409417,0,1
3.656866583,1,1
3.692245167,0,1
3.695091250,1,1
3.698631417,0,1
3.737622750,1,1
3.755415417,0,1
3.756463917,1,1
3.760534250,1,0
3.771077667,1,1
3.777317583,1,0
3.782210083,1,1
3.786356250,0,1
3.787349583,1,1
3.807484750,0,1
3.808691333,1,1
3.843198083,0,1
3.844357833,1,1
3.868997000,0,1
3.870620667,1,1
3.894767667,1,0
3.907852833,1,1
3.913544583,0,1
3.914937917,1,1
3.947415667,0,1
3.949914667,1,1
3.953313000,0,1
3.991206750,1,1
4.008575917,0,1
4.009598750,1,1
4.013529417,1,0
4.023766083,1,1
4.029855667,1,0
4.034503417,1,1
4.038319583,0,1
4.039213417,1,1
4.055896167,0,1
4.056845250,1,1
4.084233167,0,1
4.085168333,1,1
4.103715500,0,1
4.104821333,1,1
4.121977167,1,0
4.132055917,1,1
4.136372083,0,1
4.137426667,1,1
4.159085833,0,1
4.160402583,1,1
4.188058250,0,1
4.188783083,1,1
4.202854417,0,1
4.203648250,1,1
4.206650917,1,0
4.214863167,1,1
4.219610833,1,0
4.223207667,1,1
4.226012750,0,1
4.226679167,1,1
4.239235500,0,1
4.239928833,1,1
4.260147833,0,1
4.260781500,1,1
4.272815000,0,1
4.273484667,1,1
4.284079000,1,0
4.290758583,1,1
4.293363917,0,1
4.294052000,1,1
4.307123583,0,1
4.307857167,1,1
4.326660667,0,1
4.327221417,1,1
4.337788667,0,1
4.338382667,1,1
4.340544500,1,0
4.346766000,1,1
4.350073167,1,0
4.352797500,1,1
4.354838917,0,1
4.355352167,1,1
4.364938750,0,1
4.365464750,1,1
4.381145250,0,1
4.381675167,1,1
4.391547833,0,1
4.392087583,1,1
4.400692583,1,0
4.406134000,1,1
4.408292500,0,1
4.408839167,1,1
4.419339917,0,1
4.419921333,1,1
4.436156083,0,1
4.436677167,1,1
4.446345500,0,1
4.446873417,1,1
4.448896500,1,0
4.454358083,1,1
4.457201417,1,0
4.459679417,1,1
4.461615583,0,1
4.462082917,1,1
4.470938500,0,1
4.471426417,1,1
4.485121083,0,1
4.485562417,1,1
4.493836750,0,1
4.494292000,1,1
4.501447500,1,0
4.506033000,1,1
4.507835833,0,1
4.508300833,1,1
4.517021583,0,1
4.517495500,1,1
4.531065417,0,1
4.531509667,1,1
4.539786083,0,1
4.540237583,1,1
4.541935167,1,0
4.546691417,1,1
4.549310333,1,0
4.551529083,1,1
4.553279167,0,1
4.553702333,1,1
4.561714583,0,1
4.562151500,1,1
4.574809333,0,1
4.575222750,1,1
4.583018167,0,1
4.583436000,1,1
4.590126000,1,0
4.594528583,1,1
4.596178500,0,1
4.596611833,1,1
4.604795833,0,1
4.605241417,1,1
4.618190583,0,1
4.618618500,1,1
4.626610583,0,1
4.627039333,1,1
4.628718083,1,0
4.633286583,1,1
4.635870667,1,0
4.638039417,1,1
4.639751750,0,1
4.640170667,1,1
4.648051583,0,1
4.648480250,1,1
4.660986833,0,1
4.661395667,1,1
4.669171500,0,1
4.669592417,1,1
4.676239167,1,0
4.680691667,1,1
4.682325833,0,1
4.682769667,1,1
4.690966833,0,1
4.691403833,1,1
4.704480833,0,1
4.704917583,1,1
4.713039667,0,1
4.713475667,1,1
4.715179833,1,0
4.719783750,1,1
4.722454000,1,0
4.724709833,1,1
4.726442083,0,1
4.726876417,1,1
4.734959333,0,1
4.735391667,1,1
4.748305167,0,1
4.748733500,1,1
4.756787833,0,1
4.757228583,1,1
4.764140833,1,0
4.768724250,1,1
4.770464000,0,1
4.770920917,1,1
4.779444000,0,1
4.779911333,1,1
4.793613333,0,1
4.794079833,1,1
4.802626750,0,1
4.803096167,1,1
4.804816667,1,0
4.809743083,1,1
4.812548833,1,0
4.814918917,1,1
4.816787417,0,1
4.817251583,1,1
4.825814000,0,1
4.826275833,1,1
4.840055417,0,1
4.840514500,1,1
4.849118083,0,1
4.849590250,1,1
4.857029917,1,0
4.861868917,1,1
4.863735667,0,1
4.864220583,1,1
4.873344833,0,1
4.873841250,1,1
4.888622750,0,1
4.889112250,1,1
4.898368417,0,1
4.898868833,1,1
4.900786417,1,0
4.906080167,1,1
4.909233667,1,0
4.911986667,1,1
4.914062500,0,1
4.914584000,1,1
4.924383417,0,1
4.924918417,1,1
4.940730083,0,1
4.941270667,1,1
4.951159083,0,1
4.951691167,1,1
4.958695917,1,0
4.965899583,1,1
4.967975500,0,1
4.968540750,1,1
4.979123333,0,1
4.979704833,1,1
4.997198500,0,1
4.997799417,1,1
5.009176333,0,1
5.009692167,0,0
5.009795583,1,0
5.015884000,1,1
5.022699500,1,0
5.026089917,1,1
5.028643333,0,1
5.029291667,1,1
5.041653333,0,1
5.042328667,1,1
5.062901583,0,1
5.063618583,1,1
5.077220917,0,1
5.077967083,1,1
5.086313833,1,0
5.097421833,1,1
5.100700417,0,1
5.101494750,1,1
5.116651833,0,1
5.117501000,1,1
5.143076333,0,1
5.143968250,1,1
5.160806500,1,0
5.161259250,0,0
5.162218000,1,0
5.170773000,1,1
5.181267917,1,0
5.185866333,1,1
5.189409833,0,1
5.190286917,1,1
5.195665583,1,0
5.206919250,0,0
5.207844167,1,0
5.236087417,0,0
5.237071333,1,0
5.256443917,0,0
5.257534833,1,0
5.285189167,1,1
5.290931833,0,1
5.292115250,1,1
5.315923583,0,1
5.317299667,1,1
5.354929750,0,1
5.356080083,1,1
5.373609750,1,0
5.378753167,0,0
5.380068417,1,0
5.386941917,1,1
5.404560250,1,0
5.412732583,1,1
5.419821250,0,1
5.421218417,1,1
5.425764583,1,0
5.434171417,1,1
5.434171500,1,0
5.451223917,0,0
5.453071750,1,0
5.509083917,0,0
5.511124333,1,0
5.693304083,0,0
5.698197833,1,0
5.824410417,0,0
5.832162583,1,0
5.839473917,0,0
7.555072000,0,0
1 Time [s] crank cam
2 0.000000000 0 0
3 1.564359833 1 0
4 1.575405167 0 0
5 1.691305333 1 0
6 1.695809167 0 0
7 1.781376250 0 1
8 1.802194167 1 1
9 1.805902917 0 1
10 1.818287000 0 0
11 1.876171250 1 0
12 1.880239667 0 0
13 1.956382417 1 0
14 1.959712417 0 0
15 2.021044583 1 0
16 2.024797500 0 0
17 2.059558583 0 1
18 2.072814583 0 0
19 2.082386833 0 1
20 2.093364083 1 1
21 2.109644417 1 0
22 2.148812417 0 0
23 2.152125083 1 0
24 2.155911500 0 0
25 2.225955417 1 0
26 2.229369583 0 0
27 2.286644417 1 0
28 2.290199167 0 0
29 2.347494667 0 1
30 2.358203250 1 1
31 2.412384417 0 1
32 2.415629500 1 1
33 2.419386417 0 1
34 2.486860333 1 1
35 2.542413333 0 1
36 2.545543917 1 1
37 2.549017167 0 1
38 2.559069750 0 0
39 2.582399583 0 1
40 2.595386417 0 0
41 2.604812500 0 1
42 2.615566667 1 1
43 2.633051833 1 0
44 2.669346167 0 0
45 2.672590750 1 0
46 2.676287333 0 0
47 2.742344833 1 0
48 2.796466833 0 0
49 2.799672250 1 0
50 2.803189917 0 0
51 2.858015417 0 1
52 2.868454417 1 1
53 2.921197333 0 1
54 2.924384250 1 1
55 2.928094000 0 1
56 2.994312833 1 1
57 3.048448500 0 1
58 3.051726167 1 1
59 3.055255167 0 1
60 3.064572167 0 0
61 3.087696250 0 1
62 3.100520250 0 0
63 3.109771000 0 1
64 3.120470917 1 1
65 3.137033917 1 0
66 3.173488833 0 0
67 3.176730250 1 0
68 3.180492167 0 0
69 3.246366417 1 0
70 3.300527917 0 0
71 3.303774167 1 0
72 3.307322750 0 0
73 3.362247500 0 1
74 3.372859917 1 1
75 3.375890083 0 1
76 3.429460250 1 1
77 3.433188333 0 1
78 3.473809500 1 1
79 3.491902000 0 1
80 3.492960500 1 1
81 3.497116583 1 0
82 3.507737250 1 1
83 3.514072917 1 0
84 3.519061000 1 1
85 3.523271917 0 1
86 3.524285000 1 1
87 3.544917417 0 1
88 3.546180333 1 1
89 3.581912833 0 1
90 3.583091250 1 1
91 3.608697750 0 1
92 3.610380083 1 1
93 3.635820750 1 0
94 3.649447000 1 1
95 3.655409417 0 1
96 3.656866583 1 1
97 3.692245167 0 1
98 3.695091250 1 1
99 3.698631417 0 1
100 3.737622750 1 1
101 3.755415417 0 1
102 3.756463917 1 1
103 3.760534250 1 0
104 3.771077667 1 1
105 3.777317583 1 0
106 3.782210083 1 1
107 3.786356250 0 1
108 3.787349583 1 1
109 3.807484750 0 1
110 3.808691333 1 1
111 3.843198083 0 1
112 3.844357833 1 1
113 3.868997000 0 1
114 3.870620667 1 1
115 3.894767667 1 0
116 3.907852833 1 1
117 3.913544583 0 1
118 3.914937917 1 1
119 3.947415667 0 1
120 3.949914667 1 1
121 3.953313000 0 1
122 3.991206750 1 1
123 4.008575917 0 1
124 4.009598750 1 1
125 4.013529417 1 0
126 4.023766083 1 1
127 4.029855667 1 0
128 4.034503417 1 1
129 4.038319583 0 1
130 4.039213417 1 1
131 4.055896167 0 1
132 4.056845250 1 1
133 4.084233167 0 1
134 4.085168333 1 1
135 4.103715500 0 1
136 4.104821333 1 1
137 4.121977167 1 0
138 4.132055917 1 1
139 4.136372083 0 1
140 4.137426667 1 1
141 4.159085833 0 1
142 4.160402583 1 1
143 4.188058250 0 1
144 4.188783083 1 1
145 4.202854417 0 1
146 4.203648250 1 1
147 4.206650917 1 0
148 4.214863167 1 1
149 4.219610833 1 0
150 4.223207667 1 1
151 4.226012750 0 1
152 4.226679167 1 1
153 4.239235500 0 1
154 4.239928833 1 1
155 4.260147833 0 1
156 4.260781500 1 1
157 4.272815000 0 1
158 4.273484667 1 1
159 4.284079000 1 0
160 4.290758583 1 1
161 4.293363917 0 1
162 4.294052000 1 1
163 4.307123583 0 1
164 4.307857167 1 1
165 4.326660667 0 1
166 4.327221417 1 1
167 4.337788667 0 1
168 4.338382667 1 1
169 4.340544500 1 0
170 4.346766000 1 1
171 4.350073167 1 0
172 4.352797500 1 1
173 4.354838917 0 1
174 4.355352167 1 1
175 4.364938750 0 1
176 4.365464750 1 1
177 4.381145250 0 1
178 4.381675167 1 1
179 4.391547833 0 1
180 4.392087583 1 1
181 4.400692583 1 0
182 4.406134000 1 1
183 4.408292500 0 1
184 4.408839167 1 1
185 4.419339917 0 1
186 4.419921333 1 1
187 4.436156083 0 1
188 4.436677167 1 1
189 4.446345500 0 1
190 4.446873417 1 1
191 4.448896500 1 0
192 4.454358083 1 1
193 4.457201417 1 0
194 4.459679417 1 1
195 4.461615583 0 1
196 4.462082917 1 1
197 4.470938500 0 1
198 4.471426417 1 1
199 4.485121083 0 1
200 4.485562417 1 1
201 4.493836750 0 1
202 4.494292000 1 1
203 4.501447500 1 0
204 4.506033000 1 1
205 4.507835833 0 1
206 4.508300833 1 1
207 4.517021583 0 1
208 4.517495500 1 1
209 4.531065417 0 1
210 4.531509667 1 1
211 4.539786083 0 1
212 4.540237583 1 1
213 4.541935167 1 0
214 4.546691417 1 1
215 4.549310333 1 0
216 4.551529083 1 1
217 4.553279167 0 1
218 4.553702333 1 1
219 4.561714583 0 1
220 4.562151500 1 1
221 4.574809333 0 1
222 4.575222750 1 1
223 4.583018167 0 1
224 4.583436000 1 1
225 4.590126000 1 0
226 4.594528583 1 1
227 4.596178500 0 1
228 4.596611833 1 1
229 4.604795833 0 1
230 4.605241417 1 1
231 4.618190583 0 1
232 4.618618500 1 1
233 4.626610583 0 1
234 4.627039333 1 1
235 4.628718083 1 0
236 4.633286583 1 1
237 4.635870667 1 0
238 4.638039417 1 1
239 4.639751750 0 1
240 4.640170667 1 1
241 4.648051583 0 1
242 4.648480250 1 1
243 4.660986833 0 1
244 4.661395667 1 1
245 4.669171500 0 1
246 4.669592417 1 1
247 4.676239167 1 0
248 4.680691667 1 1
249 4.682325833 0 1
250 4.682769667 1 1
251 4.690966833 0 1
252 4.691403833 1 1
253 4.704480833 0 1
254 4.704917583 1 1
255 4.713039667 0 1
256 4.713475667 1 1
257 4.715179833 1 0
258 4.719783750 1 1
259 4.722454000 1 0
260 4.724709833 1 1
261 4.726442083 0 1
262 4.726876417 1 1
263 4.734959333 0 1
264 4.735391667 1 1
265 4.748305167 0 1
266 4.748733500 1 1
267 4.756787833 0 1
268 4.757228583 1 1
269 4.764140833 1 0
270 4.768724250 1 1
271 4.770464000 0 1
272 4.770920917 1 1
273 4.779444000 0 1
274 4.779911333 1 1
275 4.793613333 0 1
276 4.794079833 1 1
277 4.802626750 0 1
278 4.803096167 1 1
279 4.804816667 1 0
280 4.809743083 1 1
281 4.812548833 1 0
282 4.814918917 1 1
283 4.816787417 0 1
284 4.817251583 1 1
285 4.825814000 0 1
286 4.826275833 1 1
287 4.840055417 0 1
288 4.840514500 1 1
289 4.849118083 0 1
290 4.849590250 1 1
291 4.857029917 1 0
292 4.861868917 1 1
293 4.863735667 0 1
294 4.864220583 1 1
295 4.873344833 0 1
296 4.873841250 1 1
297 4.888622750 0 1
298 4.889112250 1 1
299 4.898368417 0 1
300 4.898868833 1 1
301 4.900786417 1 0
302 4.906080167 1 1
303 4.909233667 1 0
304 4.911986667 1 1
305 4.914062500 0 1
306 4.914584000 1 1
307 4.924383417 0 1
308 4.924918417 1 1
309 4.940730083 0 1
310 4.941270667 1 1
311 4.951159083 0 1
312 4.951691167 1 1
313 4.958695917 1 0
314 4.965899583 1 1
315 4.967975500 0 1
316 4.968540750 1 1
317 4.979123333 0 1
318 4.979704833 1 1
319 4.997198500 0 1
320 4.997799417 1 1
321 5.009176333 0 1
322 5.009692167 0 0
323 5.009795583 1 0
324 5.015884000 1 1
325 5.022699500 1 0
326 5.026089917 1 1
327 5.028643333 0 1
328 5.029291667 1 1
329 5.041653333 0 1
330 5.042328667 1 1
331 5.062901583 0 1
332 5.063618583 1 1
333 5.077220917 0 1
334 5.077967083 1 1
335 5.086313833 1 0
336 5.097421833 1 1
337 5.100700417 0 1
338 5.101494750 1 1
339 5.116651833 0 1
340 5.117501000 1 1
341 5.143076333 0 1
342 5.143968250 1 1
343 5.160806500 1 0
344 5.161259250 0 0
345 5.162218000 1 0
346 5.170773000 1 1
347 5.181267917 1 0
348 5.185866333 1 1
349 5.189409833 0 1
350 5.190286917 1 1
351 5.195665583 1 0
352 5.206919250 0 0
353 5.207844167 1 0
354 5.236087417 0 0
355 5.237071333 1 0
356 5.256443917 0 0
357 5.257534833 1 0
358 5.285189167 1 1
359 5.290931833 0 1
360 5.292115250 1 1
361 5.315923583 0 1
362 5.317299667 1 1
363 5.354929750 0 1
364 5.356080083 1 1
365 5.373609750 1 0
366 5.378753167 0 0
367 5.380068417 1 0
368 5.386941917 1 1
369 5.404560250 1 0
370 5.412732583 1 1
371 5.419821250 0 1
372 5.421218417 1 1
373 5.425764583 1 0
374 5.434171417 1 1
375 5.434171500 1 0
376 5.451223917 0 0
377 5.453071750 1 0
378 5.509083917 0 0
379 5.511124333 1 0
380 5.693304083 0 0
381 5.698197833 1 0
382 5.824410417 0 0
383 5.832162583 1 0
384 5.839473917 0 0
385 7.555072000 0 0

File diff suppressed because it is too large Load Diff

View File

@ -9,23 +9,42 @@
#include "engine_test_helper.h"
#include "logicdata_csv_reader.h"
TEST(crankingNB2, nb2RealCrankingFromFile) {
TEST(realCrankingNB2, normalCranking) {
CsvReader reader(1, /* vvtCount */ 1);
int indeces[1] = {0};
int indeces[] = {0};
reader.open("tests/trigger/resources/nb2_rev-d-4.csv", indeces);
reader.open("tests/trigger/resources/nb2-cranking-good.csv", indeces);
WITH_ENGINE_TEST_HELPER (HELLEN_NB2);
while (eth.getTimeNowUs() < 3'000'000) {
reader.readLine(&eth);
ASSERT_EQ(0, GET_RPM()) << "At line " << reader.lineIndex() << " time " << eth.getTimeNowUs();
}
while (reader.haveMore()) {
reader.processLine(&eth);
}
// ASSERT_EQ(243, GET_RPM()) << "At line " << reader.lineIndex() << " time " << eth.getTimeNowUs();
// VVT position nearly zero!
EXPECT_NEAR(engine->triggerCentral.getVVTPosition(0, 0), 3.6569f, 1e-4);
ASSERT_EQ(942, GET_RPM());
// TODO: why warnings?
ASSERT_EQ(2, eth.recentWarnings()->getCount());
}
TEST(realCrankingNB2, crankingMissingInjector) {
CsvReader reader(1, /* vvtCount */ 1);
int indeces[] = {0};
reader.open("tests/trigger/resources/nb2-cranking-good-missing-injector-1.csv", indeces);
WITH_ENGINE_TEST_HELPER (HELLEN_NB2);
while (reader.haveMore()) {
reader.processLine(&eth);
}
// VVT position nearly zero!
EXPECT_NEAR(engine->triggerCentral.getVVTPosition(0, 0), -17.8867f, 1e-4);
ASSERT_EQ(209, GET_RPM());
// TODO: why warnings?
ASSERT_EQ(2, eth.recentWarnings()->getCount());
}