Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
EMAM2Cpp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
1
Merge Requests
1
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2Cpp
Commits
e58e0a20
Commit
e58e0a20
authored
Feb 24, 2020
by
Ahmed
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some fixes
parent
344c734b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
63 additions
and
26 deletions
+63
-26
src/test/resources/results/armadillo/testMath/l0/test_math_cvtColorCommandTest.h
...lts/armadillo/testMath/l0/test_math_cvtColorCommandTest.h
+12
-4
src/test/resources/results/armadillo/testMath/l0/test_math_dilateCommandTest.h
...sults/armadillo/testMath/l0/test_math_dilateCommandTest.h
+9
-5
src/test/resources/results/armadillo/testMath/l0/test_math_erodeAndGaussianBlurCommandTest.h
...o/testMath/l0/test_math_erodeAndGaussianBlurCommandTest.h
+12
-6
src/test/resources/results/armadillo/testMath/l0/test_math_findContoursCommandTest.h
...armadillo/testMath/l0/test_math_findContoursCommandTest.h
+8
-2
src/test/resources/results/armadillo/testMath/l0/test_math_gaussianBlurCommandTest.h
...armadillo/testMath/l0/test_math_gaussianBlurCommandTest.h
+5
-1
src/test/resources/results/armadillo/testMath/l0/test_math_inRangeCommandTest.h
...ults/armadillo/testMath/l0/test_math_inRangeCommandTest.h
+9
-5
src/test/resources/results/armadillo/testMath/l0/test_math_rectangleCommandTest.h
...ts/armadillo/testMath/l0/test_math_rectangleCommandTest.h
+8
-3
No files found.
src/test/resources/results/armadillo/testMath/l0/test_math_cvtColorCommandTest.h
View file @
e58e0a20
...
...
@@ -10,18 +10,26 @@ using namespace arma;
using
namespace
std
;
class
test_math_cvtColorCommandTest
{
public:
mat
src
;
arma
::
mat
src
;
int
colorConversion
;
mat
dst
;
arma
::
mat
dst
;
void
init
()
{
src
=
mat
(
n
,
m
);
dst
=
mat
(
n
,
m
);
}
void
cvtColorHelper
(
arma
::
mat
src
,
arma
::
mat
dst
,
int
colorConversion
)
{
cv
::
Mat
srcCV
;
cv
::
Mat
dstCV
;
srcCV
=
ConvHelper
::
to_cvmat
(
src
);
cv
::
cvtColor
(
srcCV
,
dstCV
,
colorConversion
);
dst
=
ConvHelper
::
to_arma
(
dstCV
);
}
void
execute
()
{
cv
::
cvtColo
r
(
src
,
dst
,
colorConversion
);
cvtColorHelpe
r
(
src
,
dst
,
colorConversion
);
}
};
#endif
\ No newline at end of file
#endif
src/test/resources/results/armadillo/testMath/l0/test_math_dilateCommandTest.h
View file @
e58e0a20
...
...
@@ -10,26 +10,30 @@ using namespace arma;
using
namespace
std
;
class
test_math_dilateCommandTest
{
public:
mat
src
;
arma
::
mat
src
;
int
dilation_elem
;
int
iterations
;
mat
dst
;
arma
::
mat
dst
;
void
init
()
{
src
=
mat
(
n
,
m
);
dst
=
mat
(
n
,
m
);
}
void
dilateHelper
(
mat
src
,
mat
dst
,
int
dilation_elem
,
int
iterations
)
void
dilateHelper
(
arma
::
mat
src
,
arma
::
mat
dst
,
int
dilation_elem
,
int
iterations
)
{
int
dilation_type
=
0
;
if
(
dilation_elem
==
0
){
dilation_type
=
MORPH_RECT
;
}
else
if
(
dilation_elem
==
1
){
dilation_type
=
MORPH_CROSS
;
}
else
if
(
dilation_elem
==
2
)
{
dilation_type
=
MORPH_ELLIPSE
;
}
dilation_size
=
dilation_elem
;
mat
element
=
cv
::
getStructuringElement
(
dilation_type
,
cv
::
mat
element
=
cv
::
getStructuringElement
(
dilation_type
,
Size
(
2
*
dilation_size
+
1
,
2
*
dilation_size
+
1
),
Point
(
-
1
,
-
1
)
);
cv
::
dilate
(
src
,
dst
,
element
,
Point
(
-
1
,
-
1
),
iterations
);
cv
::
Mat
srcCV
;
cv
::
Mat
dstCV
;
srcCV
=
ConvHelper
::
to_cvmat
(
src
);
cv
::
dilate
(
srcCV
,
dstCV
,
element
,
Point
(
-
1
,
-
1
),
iterations
);
dst
=
ConvHelper
::
to_arma
(
dstCV
);
}
void
execute
()
{
...
...
src/test/resources/results/armadillo/testMath/l0/test_math_erodeAndGaussianBlurCommandTest.h
View file @
e58e0a20
...
...
@@ -17,7 +17,7 @@ colvec sizeY;
colvec
two
;
cube
dst
;
cube
outMatrix
;
mat
out2Matrix
;
arma
::
mat
out2Matrix
;
void
init
()
{
src
=
cube
(
n
,
m
,
3
);
...
...
@@ -27,30 +27,36 @@ dst = cube(n, m, 3);
outMatrix
=
cube
(
3
,
n
,
m
);
out2Matrix
=
mat
(
2
,
m
);
}
void
erodeHelper
(
cube
src
,
c
ube
dst
,
int
erosion_elem
,
int
iterations
)
void
erodeHelper
(
cube
src
,
c
v
::
Mat
dst
,
int
erosion_elem
,
int
iterations
)
{
int
erosion_type
=
0
;
if
(
erosion_elem
==
0
){
erosion_type
=
MORPH_RECT
;
}
else
if
(
erosion_elem
==
1
){
erosion_type
=
MORPH_CROSS
;
}
else
if
(
erosion_elem
==
2
)
{
erosion_type
=
MORPH_ELLIPSE
;
}
erosion_size
=
erosion_elem
;
m
at
element
=
cv
::
getStructuringElement
(
erosion_type
,
cv
::
M
at
element
=
cv
::
getStructuringElement
(
erosion_type
,
Size
(
2
*
erosion_size
+
1
,
2
*
erosion_size
+
1
),
Point
(
-
1
,
-
1
)
);
cv
::
erode
(
src
,
dst
,
element
,
Point
(
-
1
,
-
1
),
iterations
);
cv
::
Mat
srcCV
;
srcCV
=
ConvHelper
::
to_cvmat
(
src
);
cv
::
erode
(
srcCV
,
dst
,
element
,
Point
(
-
1
,
-
1
),
iterations
);
}
void
dilateHelper
(
c
ube
src
,
cube
dst
,
int
dilation_elem
,
int
iterations
)
void
dilateHelper
(
c
v
::
Mat
src
,
cv
::
Mat
dst
,
int
dilation_elem
,
int
iterations
)
{
int
dilation_type
=
0
;
if
(
dilation_elem
==
0
){
dilation_type
=
MORPH_RECT
;
}
else
if
(
dilation_elem
==
1
){
dilation_type
=
MORPH_CROSS
;
}
else
if
(
dilation_elem
==
2
)
{
dilation_type
=
MORPH_ELLIPSE
;
}
dilation_size
=
dilation_elem
;
mat
element
=
cv
::
getStructuringElement
(
dilation_type
,
cv
::
mat
element
=
cv
::
getStructuringElement
(
dilation_type
,
Size
(
2
*
dilation_size
+
1
,
2
*
dilation_size
+
1
),
Point
(
-
1
,
-
1
)
);
cv
::
dilate
(
src
,
dst
,
element
,
Point
(
-
1
,
-
1
),
iterations
);
}
void
findContoursHelper
(
cv
::
Mat
image
,
vector
<
vector
<
cv
::
Point
>>
contours
,
int
mode
,
int
method
)
{
cv
::
findContours
(
image
,
contours
,
mode
,
method
);
}
void
execute
()
{
erodeHelper
(
src
,
dst
,
erosion_elem
,
iterations
);
...
...
src/test/resources/results/armadillo/testMath/l0/test_math_findContoursCommandTest.h
View file @
e58e0a20
...
...
@@ -11,7 +11,7 @@ using namespace arma;
using
namespace
std
;
class
test_math_findContoursCommandTest
{
public:
mat
image
;
arma
::
mat
image
;
int
mode
;
int
method
;
vector
<
vector
<
cv
::
Point
>>
contours
;
...
...
@@ -19,10 +19,16 @@ void init()
{
image
=
mat
(
n
,
m
);
}
void
findContoursHelper
(
arma
::
mat
image
,
vector
<
vector
<
cv
::
Point
>>
contours
,
int
mode
,
int
method
)
{
cv
::
Mat
srcCV
;
srcCV
=
ConvHelper
::
to_cvmat
(
src
);
cv
::
findContours
(
image
,
contours
,
mode
,
method
);
}
void
execute
()
{
cv
::
findContours
(
image
,
contours
,
mode
,
method
);
}
};
#endif
#endif
\ No newline at end of file
src/test/resources/results/armadillo/testMath/l0/test_math_gaussianBlurCommandTest.h
View file @
e58e0a20
...
...
@@ -23,7 +23,11 @@ dst = cube(3, n, m);
}
void
gaussianBlurHelper
(
cube
src
,
cube
dst
,
int
sizeX
,
int
sizeY
,
double
sigmaX
,
double
sigmaY
)
{
cv
::
gaussianBlur
(
src
,
dst
,
Size
(
sizeX
,
sizeY
),
sigmaX
,
sigmaY
);
cv
::
Mat
srcCV
;
cv
::
Mat
dstCV
;
srcCV
=
ConvHelper
::
to_cvmat
(
src
);
cv
::
gaussianBlur
(
srcCV
,
dstCV
,
Size
(
sizeX
,
sizeY
),
sigmaX
,
sigmaY
);
dst
=
ConvHelper
::
to_armaCube
(
dstCV
);
}
void
execute
()
{
...
...
src/test/resources/results/armadillo/testMath/l0/test_math_inRangeCommandTest.h
View file @
e58e0a20
...
...
@@ -10,10 +10,10 @@ using namespace arma;
using
namespace
std
;
class
test_math_inRangeCommandTest
{
public:
mat
src
;
arma
::
mat
src
;
colvec
lowerBoundary
;
colvec
upperBoundary
;
mat
dst
;
arma
::
mat
dst
;
void
init
()
{
src
=
mat
(
n
,
m
);
...
...
@@ -21,10 +21,14 @@ lowerBoundary=colvec(3);
upperBoundary
=
colvec
(
3
);
dst
=
mat
(
n
,
m
);
}
void
inRangeHelper
(
cube
src
,
mat
dst
,
colvec
lowerB
,
colvec
upperB
)
void
inRangeHelper
(
cube
src
,
arma
::
mat
dst
,
colvec
lowerB
,
colvec
upperB
)
{
cv
::
inRange
(
src
,
Scalar
(
lowerB
(
0
),
lowerB
(
1
),
lowerB
(
2
)),
Scalar
(
upperB
(
0
),
upperB
(
1
),
upperB
(
2
)),
dst
);
cv
::
Mat
srcCV
;
cv
::
Mat
dstCV
;
srcCV
=
ConvHelper
::
to_cvmat
(
src
);
cv
::
inRange
(
srcCV
,
cv
::
Scalar
(
lowerB
(
0
),
lowerB
(
1
),
lowerB
(
2
)),
cv
::
Scalar
(
upperB
(
0
),
upperB
(
1
),
upperB
(
2
)),
dstCV
);
dst
=
ConvHelper
::
to_arma
(
dstCV
);
}
void
execute
()
{
...
...
src/test/resources/results/armadillo/testMath/l0/test_math_rectangleCommandTest.h
View file @
e58e0a20
...
...
@@ -22,10 +22,14 @@ src = cube(3, n, m);
color
=
colvec
(
3
);
outputImg
=
cube
(
3
,
n
,
m
);
}
Mat
rectangleHelper
(
Mat
src
,
Rect
rect
,
colvec
color
,
int
thickness
,
int
lineType
)
cube
rectangleHelper
(
cube
src
,
cv
::
Rect
rect
,
colvec
color
,
int
thickness
,
int
lineType
)
{
cv
::
rectangle
(
src
,
rect
.
tl
(),
rect
.
br
(),
Scalar
(
color
(
0
),
color
(
1
),
color
(
2
)),
thickness
,
lineType
);
return
src
;
cv
::
Mat
srcCV
;
srcCV
=
ConvHelper
::
to_cvmat
(
src
);
cv
::
rectangle
(
srcCV
,
rect
.
tl
(),
rect
.
br
(),
Scalar
(
color
(
0
),
color
(
1
),
color
(
2
)),
thickness
,
lineType
);
arma
::
cube
srcCube
;
srcCube
=
to_armaCube
(
srcCV
);
return
srcCube
;
}
void
execute
()
{
...
...
@@ -34,3 +38,4 @@ outputImg = (rectangleHelper(src, rect, color, thickness, lineType));
};
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment