@@ -53,24 +53,24 @@ namespace python_multi_array
53
53
{
54
54
switch (ndim)
55
55
{
56
- case 1 :
57
- return python::object (std::make_shared<multi_array<T, 1 >>(extents[s[0 ]]));
58
- case 2 :
59
- return python::object (std::make_shared<multi_array<T, 2 >>(extents[s[0 ]][s[1 ]]));
60
- case 3 :
61
- return python::object (std::make_shared<multi_array<T, 3 >>(extents[s[0 ]][s[1 ]][s[2 ]]));
62
- case 4 :
63
- return python::object (std::make_shared<multi_array<T, 4 >>(extents[s[0 ]][s[1 ]][s[2 ]][s[3 ]]));
64
- case 5 :
65
- return python::object (std::make_shared<multi_array<T, 5 >>(extents[s[0 ]][s[1 ]][s[2 ]][s[3 ]][s[4 ]]));
66
- case 6 :
67
- return python::object (std::make_shared<multi_array<T, 6 >>(extents[s[0 ]][s[1 ]][s[2 ]][s[3 ]][s[4 ]][s[5 ]]));
68
- case 7 :
69
- return python::object (std::make_shared<multi_array<T, 7 >>(extents[s[0 ]][s[1 ]][s[2 ]][s[3 ]][s[4 ]][s[5 ]][s[6 ]]));
70
- case 8 :
71
- return python::object (std::make_shared<multi_array<T, 8 >>(extents[s[0 ]][s[1 ]][s[2 ]][s[3 ]][s[4 ]][s[5 ]][s[6 ]][s[7 ]]));
72
- default :
73
- throw std::invalid_argument (" shape" );
56
+ case 1 :
57
+ return python::object (std::make_shared<multi_array<T, 1 >>(extents[s[0 ]]));
58
+ case 2 :
59
+ return python::object (std::make_shared<multi_array<T, 2 >>(extents[s[0 ]][s[1 ]]));
60
+ case 3 :
61
+ return python::object (std::make_shared<multi_array<T, 3 >>(extents[s[0 ]][s[1 ]][s[2 ]]));
62
+ case 4 :
63
+ return python::object (std::make_shared<multi_array<T, 4 >>(extents[s[0 ]][s[1 ]][s[2 ]][s[3 ]]));
64
+ case 5 :
65
+ return python::object (std::make_shared<multi_array<T, 5 >>(extents[s[0 ]][s[1 ]][s[2 ]][s[3 ]][s[4 ]]));
66
+ case 6 :
67
+ return python::object (std::make_shared<multi_array<T, 6 >>(extents[s[0 ]][s[1 ]][s[2 ]][s[3 ]][s[4 ]][s[5 ]]));
68
+ case 7 :
69
+ return python::object (std::make_shared<multi_array<T, 7 >>(extents[s[0 ]][s[1 ]][s[2 ]][s[3 ]][s[4 ]][s[5 ]][s[6 ]]));
70
+ case 8 :
71
+ return python::object (std::make_shared<multi_array<T, 8 >>(extents[s[0 ]][s[1 ]][s[2 ]][s[3 ]][s[4 ]][s[5 ]][s[6 ]][s[7 ]]));
72
+ default :
73
+ throw std::invalid_argument (" shape" );
74
74
}
75
75
}
76
76
@@ -304,24 +304,24 @@ namespace python_multi_array
304
304
const size_t * s = This->shape ();
305
305
switch (N)
306
306
{
307
- case 1 :
308
- return python::make_tuple (s[0 ]);
309
- case 2 :
310
- return python::make_tuple (s[0 ], s[1 ]);
311
- case 3 :
312
- return python::make_tuple (s[0 ], s[1 ], s[2 ]);
313
- case 4 :
314
- return python::make_tuple (s[0 ], s[1 ], s[2 ], s[3 ]);
315
- case 5 :
316
- return python::make_tuple (s[0 ], s[1 ], s[2 ], s[3 ], s[4 ]);
317
- case 6 :
318
- return python::make_tuple (s[0 ], s[1 ], s[2 ], s[3 ], s[4 ], s[5 ]);
319
- case 7 :
320
- return python::make_tuple (s[0 ], s[1 ], s[2 ], s[3 ], s[4 ], s[5 ], s[6 ]);
321
- case 8 :
322
- return python::make_tuple (s[0 ], s[1 ], s[2 ], s[3 ], s[4 ], s[5 ], s[6 ], s[7 ]);
323
- default :
324
- throw std::invalid_argument (" self" );
307
+ case 1 :
308
+ return python::make_tuple (s[0 ]);
309
+ case 2 :
310
+ return python::make_tuple (s[0 ], s[1 ]);
311
+ case 3 :
312
+ return python::make_tuple (s[0 ], s[1 ], s[2 ]);
313
+ case 4 :
314
+ return python::make_tuple (s[0 ], s[1 ], s[2 ], s[3 ]);
315
+ case 5 :
316
+ return python::make_tuple (s[0 ], s[1 ], s[2 ], s[3 ], s[4 ]);
317
+ case 6 :
318
+ return python::make_tuple (s[0 ], s[1 ], s[2 ], s[3 ], s[4 ], s[5 ]);
319
+ case 7 :
320
+ return python::make_tuple (s[0 ], s[1 ], s[2 ], s[3 ], s[4 ], s[5 ], s[6 ]);
321
+ case 8 :
322
+ return python::make_tuple (s[0 ], s[1 ], s[2 ], s[3 ], s[4 ], s[5 ], s[6 ], s[7 ]);
323
+ default :
324
+ throw std::invalid_argument (" self" );
325
325
}
326
326
}
327
327
@@ -379,22 +379,22 @@ namespace python_multi_array
379
379
auto make_tuple_from_array = [](const size_t * a) {
380
380
switch (N)
381
381
{
382
- case 1 :
383
- return python::make_tuple (a[0 ]);
384
- case 2 :
385
- return python::make_tuple (a[0 ], a[1 ]);
386
- case 3 :
387
- return python::make_tuple (a[0 ], a[1 ], a[2 ]);
388
- case 4 :
389
- return python::make_tuple (a[0 ], a[1 ], a[2 ], a[3 ]);
390
- case 5 :
391
- return python::make_tuple (a[0 ], a[1 ], a[2 ], a[3 ], a[4 ]);
392
- case 6 :
393
- return python::make_tuple (a[0 ], a[1 ], a[2 ], a[3 ], a[4 ], a[5 ]);
394
- case 7 :
395
- return python::make_tuple (a[0 ], a[1 ], a[2 ], a[3 ], a[4 ], a[5 ], a[6 ]);
396
- case 8 :
397
- return python::make_tuple (a[0 ], a[1 ], a[2 ], a[3 ], a[4 ], a[5 ], a[6 ], a[7 ]);
382
+ case 1 :
383
+ return python::make_tuple (a[0 ]);
384
+ case 2 :
385
+ return python::make_tuple (a[0 ], a[1 ]);
386
+ case 3 :
387
+ return python::make_tuple (a[0 ], a[1 ], a[2 ]);
388
+ case 4 :
389
+ return python::make_tuple (a[0 ], a[1 ], a[2 ], a[3 ]);
390
+ case 5 :
391
+ return python::make_tuple (a[0 ], a[1 ], a[2 ], a[3 ], a[4 ]);
392
+ case 6 :
393
+ return python::make_tuple (a[0 ], a[1 ], a[2 ], a[3 ], a[4 ], a[5 ]);
394
+ case 7 :
395
+ return python::make_tuple (a[0 ], a[1 ], a[2 ], a[3 ], a[4 ], a[5 ], a[6 ]);
396
+ case 8 :
397
+ return python::make_tuple (a[0 ], a[1 ], a[2 ], a[3 ], a[4 ], a[5 ], a[6 ], a[7 ]);
398
398
}
399
399
throw std::invalid_argument (" this" );
400
400
};
0 commit comments