1
- /* Copyright © 2017-2020 ABBYY Production LLC
1
+ /* Copyright © 2017-2023 ABBYY
2
2
3
3
Licensed under the Apache License, Version 2.0 (the "License");
4
4
you may not use this file except in compliance with the License.
@@ -31,10 +31,10 @@ static void subVectorFromMatrixColumnsTestImpl( const CTestParams& params, int s
31
31
32
32
CREATE_FILL_FLOAT_ARRAY ( getMatrix, valuesInterval.Begin , valuesInterval.End , height * width, random )
33
33
CREATE_FILL_FLOAT_ARRAY ( vector, valuesInterval.Begin , valuesInterval.End , height, random )
34
- std::vector<float > expectedMatrix;
35
- expectedMatrix = getMatrix;
34
+ std::vector<float > expectedMatrix = getMatrix; // copy vector
36
35
37
- MathEngine ().SubVectorFromMatrixColumns ( CARRAY_FLOAT_WRAPPER ( expectedMatrix ), CARRAY_FLOAT_WRAPPER ( getMatrix ), height, width, CARRAY_FLOAT_WRAPPER ( vector ) );
36
+ MathEngine ().SubVectorFromMatrixColumns ( CARRAY_FLOAT_WRAPPER ( expectedMatrix ),
37
+ CARRAY_FLOAT_WRAPPER ( getMatrix ), height, width, CARRAY_FLOAT_WRAPPER ( vector ) );
38
38
39
39
for ( int h = 0 ; h < height; ++h ) {
40
40
for ( int w = 0 ; w < width; ++w ) {
@@ -47,7 +47,6 @@ static void subVectorFromMatrixColumnsTestImpl( const CTestParams& params, int s
47
47
}
48
48
}
49
49
50
-
51
50
// ---------------------------------------------------------------------------------------------------------------------
52
51
53
52
class CSubVectorFromMatrixColumnsTest : public CTestFixtureWithParams {
@@ -58,19 +57,13 @@ INSTANTIATE_TEST_CASE_P( CSubVectorFromMatrixColumnsTestInstantiation, CSubVecto
58
57
CTestParams (
59
58
" Height = (1..50);"
60
59
" Width = (1..50);"
61
- " BatchSize = (1..5);"
62
- " VectorSize = (1..20);"
63
60
" Values = (-1..1);"
64
- " Channels = (1..5);"
65
61
" TestCount = 100;"
66
62
),
67
63
CTestParams(
68
64
" Height = (100..500);"
69
65
" Width = (100..500);"
70
- " BatchSize = (1..5);"
71
- " VectorSize = (30..50);"
72
66
" Values = (-1..1);"
73
- " Channels = (1..5);"
74
67
" TestCount = 5;"
75
68
)
76
69
)
0 commit comments