Skip to content

Commit b16bb8e

Browse files
whart222whart222
committed
Bug fix
1 parent b0b9760 commit b16bb8e

File tree

1 file changed

+34
-84
lines changed

1 file changed

+34
-84
lines changed

Diff for: ‎lib/coek/test/smoke/test_model.cpp

+34-84
Original file line numberDiff line numberDiff line change
@@ -139,282 +139,232 @@ TEST_CASE("model_names", "[smoke]")
139139
#endif
140140

141141
auto p = coek::parameter("p");
142-
#if __cpp_lib_variant
143142
auto q = coek::parameter("q", 10);
144143
auto r = coek::parameter("r", {10, 10});
145-
# ifdef COEK_WITH_COMPACT_MODEL
144+
#ifdef COEK_WITH_COMPACT_MODEL
146145
auto qq = coek::parameter("qq", I);
147146
auto rr = coek::parameter("rr", I * I);
148-
# endif
149147
#endif
150148

151149
auto x = coek::variable("x");
152-
#if __cpp_lib_variant
153150
auto y = coek::variable("y", 10);
154151
auto z = coek::variable("z", {10, 10});
155-
# ifdef COEK_WITH_COMPACT_MODEL
152+
#ifdef COEK_WITH_COMPACT_MODEL
156153
auto yy = coek::variable("yy", I);
157154
auto zz = coek::variable("zz", I * I);
158-
# endif
159155
#endif
160156

161157
auto c = coek::constraint("c", x == 1);
162-
#if __cpp_lib_variant
163158
auto d = coek::constraint("d", 10);
164159
d(0) = x == 1;
165160
auto e = coek::constraint("e", {10, 10});
166161
e(0, 0) = x == 1;
167-
# ifdef COEK_WITH_COMPACT_MODEL
162+
#ifdef COEK_WITH_COMPACT_MODEL
168163
auto dd = coek::constraint("dd", I);
169164
dd(0) = x == 1;
170165
auto ee = coek::constraint("ee", I * I);
171166
ee(0, 0) = x == 1;
172-
# endif
173167
#endif
174168

175169
SECTION("simple")
176170
{
177171
// m.add(p);
178-
#if __cpp_lib_variant
179172
m.add(q);
180173
m.add(r);
181-
# ifdef COEK_WITH_COMPACT_MODEL
174+
#ifdef COEK_WITH_COMPACT_MODEL
182175
m.add(qq);
183176
m.add(rr);
184-
# endif
185177
#endif
186178
m.add(x);
187-
#if __cpp_lib_variant
188179
m.add(y);
189180
m.add(z);
190-
# ifdef COEK_WITH_COMPACT_MODEL
181+
#ifdef COEK_WITH_COMPACT_MODEL
191182
m.add(yy);
192183
m.add(zz);
193-
# endif
194184
#endif
195185
m.add(c);
196-
#if __cpp_lib_variant
197186
m.add(d);
198187
m.add(e);
199-
# ifdef COEK_WITH_COMPACT_MODEL
188+
#ifdef COEK_WITH_COMPACT_MODEL
200189
m.add(dd);
201190
m.add(ee);
202-
# endif
203191
#endif
204192

205193
REQUIRE(m.name_generation() == coek::Model::NameGeneration::simple);
206-
#if __cpp_lib_variant
207194
REQUIRE(m.repn->parameter_arrays.size() == 2);
208195
REQUIRE(m.repn->variable_arrays.size() == 2);
209-
# ifdef COEK_WITH_COMPACT_MODEL
196+
#ifdef COEK_WITH_COMPACT_MODEL
210197
REQUIRE(m.repn->parameter_maps.size() == 2);
211198
REQUIRE(m.repn->variable_maps.size() == 2);
212-
# endif
213199
REQUIRE(m.repn->constraint_maps.size() == 4);
200+
#else
201+
REQUIRE(m.repn->constraint_maps.size() == 2);
214202
#endif
215203

216204
REQUIRE(coek::starts_with(p.name(), "p"));
217-
#if __cpp_lib_variant
218205
REQUIRE(coek::starts_with(q(0).name(), "P"));
219206
REQUIRE(coek::starts_with(r(0, 0).name(), "P"));
220-
# ifdef COEK_WITH_COMPACT_MODEL
207+
#ifdef COEK_WITH_COMPACT_MODEL
221208
REQUIRE(coek::starts_with(qq(0).name(), "P"));
222209
REQUIRE(coek::starts_with(rr(0, 0).name(), "P"));
223-
# endif
224210
#endif
225211
REQUIRE(coek::starts_with(x.name(), "x"));
226-
#if __cpp_lib_variant
227212
REQUIRE(coek::starts_with(y(0).name(), "X"));
228213
REQUIRE(coek::starts_with(z(0, 0).name(), "X"));
229-
# ifdef COEK_WITH_COMPACT_MODEL
214+
#ifdef COEK_WITH_COMPACT_MODEL
230215
REQUIRE(coek::starts_with(yy(0).name(), "X"));
231216
REQUIRE(coek::starts_with(zz(0, 0).name(), "X"));
232-
# endif
233217
#endif
234218
REQUIRE(coek::starts_with(c.name(), "c"));
235-
#if __cpp_lib_variant
236219
REQUIRE(coek::starts_with(d(0).name(), "C"));
237220
REQUIRE(coek::starts_with(e(0, 0).name(), "C"));
238-
# ifdef COEK_WITH_COMPACT_MODEL
221+
#ifdef COEK_WITH_COMPACT_MODEL
239222
REQUIRE(coek::starts_with(dd(0).name(), "C"));
240223
REQUIRE(coek::starts_with(ee(0, 0).name(), "C"));
241-
# endif
242224
#endif
243225
}
244226

245227
SECTION("lazy")
246228
{
247229
m.name_generation(coek::Model::NameGeneration::lazy);
248230
// m.add(p);
249-
#if __cpp_lib_variant
250231
m.add(q);
251232
m.add(r);
252-
# ifdef COEK_WITH_COMPACT_MODEL
233+
#ifdef COEK_WITH_COMPACT_MODEL
253234
m.add(qq);
254235
m.add(rr);
255-
# endif
256236
#endif
257237
m.add(x);
258-
#if __cpp_lib_variant
259238
m.add(y);
260239
m.add(z);
261-
# ifdef COEK_WITH_COMPACT_MODEL
240+
#ifdef COEK_WITH_COMPACT_MODEL
262241
m.add(yy);
263242
m.add(zz);
264-
# endif
265243
#endif
266244
m.add(c);
267-
#if __cpp_lib_variant
268245
m.add(d);
269246
m.add(e);
270-
# ifdef COEK_WITH_COMPACT_MODEL
247+
#ifdef COEK_WITH_COMPACT_MODEL
271248
m.add(dd);
272249
m.add(ee);
273-
# endif
274250
#endif
275251

276252
REQUIRE(m.name_generation() == coek::Model::NameGeneration::lazy);
277-
#if __cpp_lib_variant
278253
REQUIRE(m.repn->parameter_arrays.size() == 2);
279254
REQUIRE(m.repn->variable_arrays.size() == 2);
280-
# ifdef COEK_WITH_COMPACT_MODEL
255+
#ifdef COEK_WITH_COMPACT_MODEL
281256
REQUIRE(m.repn->parameter_maps.size() == 2);
282257
REQUIRE(m.repn->variable_maps.size() == 2);
283-
# endif
284-
# ifdef COEK_WITH_COMPACT_MODEL
258+
#endif
259+
#ifdef COEK_WITH_COMPACT_MODEL
285260
REQUIRE(m.repn->constraint_maps.size() == 4);
286-
# else
261+
#else
287262
REQUIRE(m.repn->constraint_maps.size() == 2);
288-
# endif
289263
#endif
290264

291265
REQUIRE(coek::starts_with(p.name(), "p"));
292-
#if __cpp_lib_variant
293266
REQUIRE(coek::starts_with(q(0).name(), "P"));
294267
REQUIRE(coek::starts_with(r(0, 0).name(), "P"));
295-
# ifdef COEK_WITH_COMPACT_MODEL
268+
#ifdef COEK_WITH_COMPACT_MODEL
296269
REQUIRE(coek::starts_with(qq(0).name(), "P"));
297270
REQUIRE(coek::starts_with(rr(0, 0).name(), "P"));
298-
# endif
299271
#endif
300272
REQUIRE(coek::starts_with(x.name(), "x"));
301-
#if __cpp_lib_variant
302273
REQUIRE(coek::starts_with(y(0).name(), "X"));
303274
REQUIRE(coek::starts_with(z(0, 0).name(), "X"));
304-
# ifdef COEK_WITH_COMPACT_MODEL
275+
#ifdef COEK_WITH_COMPACT_MODEL
305276
REQUIRE(coek::starts_with(yy(0).name(), "X"));
306277
REQUIRE(coek::starts_with(zz(0, 0).name(), "X"));
307-
# endif
308278
#endif
309279
REQUIRE(coek::starts_with(c.name(), "c"));
310-
#if __cpp_lib_variant
311280
REQUIRE(coek::starts_with(d(0).name(), "C"));
312281
REQUIRE(coek::starts_with(e(0, 0).name(), "C"));
313-
# ifdef COEK_WITH_COMPACT_MODEL
282+
#ifdef COEK_WITH_COMPACT_MODEL
314283
REQUIRE(coek::starts_with(dd(0).name(), "C"));
315284
REQUIRE(coek::starts_with(ee(0, 0).name(), "C"));
316-
# endif
317285
#endif
318286

319287
m.generate_names();
320288

321289
REQUIRE(p.name() == "p");
322-
#if __cpp_lib_variant
323290
REQUIRE(q(0).name() == "q[0]");
324291
REQUIRE(r(0, 0).name() == "r[0,0]");
325-
# ifdef COEK_WITH_COMPACT_MODEL
292+
#ifdef COEK_WITH_COMPACT_MODEL
326293
REQUIRE(qq(0).name() == "qq[0]");
327294
REQUIRE(rr(0, 0).name() == "rr[0,0]");
328-
# endif
329295
#endif
330296
REQUIRE(x.name() == "x");
331-
#if __cpp_lib_variant
332297
REQUIRE(y(0).name() == "y[0]");
333298
REQUIRE(z(0, 0).name() == "z[0,0]");
334-
# ifdef COEK_WITH_COMPACT_MODEL
299+
#ifdef COEK_WITH_COMPACT_MODEL
335300
REQUIRE(yy(0).name() == "yy[0]");
336301
REQUIRE(zz(0, 0).name() == "zz[0,0]");
337-
# endif
338302
#endif
339303
REQUIRE(c.name() == "c");
340-
#if __cpp_lib_variant
341304
REQUIRE(d(0).name() == "d[0]");
342305
REQUIRE(e(0, 0).name() == "e[0,0]");
343-
# ifdef COEK_WITH_COMPACT_MODEL
306+
#ifdef COEK_WITH_COMPACT_MODEL
344307
REQUIRE(dd(0).name() == "dd[0]");
345308
REQUIRE(ee(0, 0).name() == "ee[0,0]");
346-
# endif
347309
#endif
348310
}
349311

350312
SECTION("eager")
351313
{
352314
m.name_generation(coek::Model::NameGeneration::eager);
353315
// m.add(p);
354-
#if __cpp_lib_variant
355316
m.add(q);
356317
m.add(r);
357-
# ifdef COEK_WITH_COMPACT_MODEL
318+
#ifdef COEK_WITH_COMPACT_MODEL
358319
m.add(qq);
359320
m.add(rr);
360-
# endif
361321
#endif
362322
m.add(x);
363-
#if __cpp_lib_variant
364323
m.add(y);
365324
m.add(z);
366-
# ifdef COEK_WITH_COMPACT_MODEL
325+
#ifdef COEK_WITH_COMPACT_MODEL
367326
m.add(yy);
368327
m.add(zz);
369-
# endif
370328
#endif
371329
m.add(c);
372-
#if __cpp_lib_variant
373330
m.add(d);
374331
m.add(e);
375-
# ifdef COEK_WITH_COMPACT_MODEL
332+
#ifdef COEK_WITH_COMPACT_MODEL
376333
m.add(dd);
377334
m.add(ee);
378-
# endif
379335
#endif
380336

381337
REQUIRE(m.name_generation() == coek::Model::NameGeneration::eager);
382-
#if __cpp_lib_variant
383338
REQUIRE(m.repn->parameter_arrays.size() == 2);
384339
REQUIRE(m.repn->variable_arrays.size() == 2);
385-
# ifdef COEK_WITH_COMPACT_MODEL
340+
#ifdef COEK_WITH_COMPACT_MODEL
386341
REQUIRE(m.repn->parameter_maps.size() == 2);
387342
REQUIRE(m.repn->variable_maps.size() == 2);
388-
# endif
389343
REQUIRE(m.repn->constraint_maps.size() == 4);
344+
#else
345+
REQUIRE(m.repn->constraint_maps.size() == 2);
390346
#endif
391347

392348
REQUIRE(p.name() == "p");
393-
#if __cpp_lib_variant
394349
REQUIRE(q(0).name() == "q[0]");
395350
REQUIRE(r(0, 0).name() == "r[0,0]");
396-
# ifdef COEK_WITH_COMPACT_MODEL
351+
#ifdef COEK_WITH_COMPACT_MODEL
397352
REQUIRE(qq(0).name() == "qq[0]");
398353
REQUIRE(rr(0, 0).name() == "rr[0,0]");
399-
# endif
400354
#endif
401355
REQUIRE(x.name() == "x");
402-
#if __cpp_lib_variant
403356
REQUIRE(y(0).name() == "y[0]");
404357
REQUIRE(z(0, 0).name() == "z[0,0]");
405-
# ifdef COEK_WITH_COMPACT_MODEL
358+
#ifdef COEK_WITH_COMPACT_MODEL
406359
REQUIRE(yy(0).name() == "yy[0]");
407360
REQUIRE(zz(0, 0).name() == "zz[0,0]");
408-
# endif
409361
#endif
410362
REQUIRE(c.name() == "c");
411-
#if __cpp_lib_variant
412363
REQUIRE(d(0).name() == "d[0]");
413364
REQUIRE(e(0, 0).name() == "e[0,0]");
414-
# ifdef COEK_WITH_COMPACT_MODEL
365+
#ifdef COEK_WITH_COMPACT_MODEL
415366
REQUIRE(dd(0).name() == "dd[0]");
416367
REQUIRE(ee(0, 0).name() == "ee[0,0]");
417-
# endif
418368
#endif
419369
}
420370
}

0 commit comments

Comments
 (0)