Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CTA-LAPP
PHOENIX_LIBS
PhoenixMath
Commits
52fa03bc
Commit
52fa03bc
authored
Dec 20, 2020
by
Pierre Aubert
Browse files
Add branch test
parent
452118a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
TESTS/TEST_PHISTOGRAM/main.cpp
TESTS/TEST_PHISTOGRAM/main.cpp
+4
-1
src/PHistogram/PHistogram_impl.h
src/PHistogram/PHistogram_impl.h
+7
-6
No files found.
TESTS/TEST_PHISTOGRAM/main.cpp
View file @
52fa03bc
...
...
@@ -63,9 +63,11 @@ bool testPHistogram2(){
hist4
.
setRange
(
-
1.0
f
,
1.0
f
);
hist4
.
resize
(
20lu
);
for
(
size_t
i
(
0lu
);
i
<
200lu
;
++
i
){
hist4
.
addAmplitude
((((
float
)(
i
*
27lu
%
19
))
-
9.0
)
/
5.0
f
,
1.0
f
);
hist4
.
addAmplitude
((((
float
)(
i
*
27lu
%
19
))
-
9.0
)
/
5.0
f
,
-
1.0
f
);
}
std
::
cout
<<
hist4
<<
std
::
endl
;
hist4
.
checkLogValue
(
0.001
f
);
hist4
.
resize
(
0lu
);
PHistogram
<
float
>
emptyHist
;
std
::
cout
<<
emptyHist
<<
std
::
endl
;
...
...
@@ -74,6 +76,7 @@ bool testPHistogram2(){
emptyHist
.
addAmplitude
(
3.0
f
,
4.0
f
);
emptyHist
.
setValueRange
(
tabValue
,
14lu
);
emptyHist
.
addValue
(
tabValue
,
14lu
);
emptyHist
.
checkLogValue
(
0.001
f
);
return
b
;
}
...
...
src/PHistogram/PHistogram_impl.h
View file @
52fa03bc
...
...
@@ -101,7 +101,7 @@ void PHistogram<T>::checkLogValue(T lowValue){
*/
template
<
typename
T
>
void
PHistogram
<
T
>::
addValue
(
T
value
){
if
(
p_nbValue
==
0
||
p_value
==
NULL
)
return
;
if
(
p_value
==
NULL
)
return
;
if
(
value
>=
p_xMax
||
value
<
p_xMin
){
if
(
value
>=
p_xMax
)
++
p_overXMax
;
if
(
value
<
p_xMin
)
++
p_underXMin
;
...
...
@@ -118,7 +118,7 @@ void PHistogram<T>::addValue(T value){
*/
template
<
typename
T
>
void
PHistogram
<
T
>::
addValue
(
const
T
*
tabValue
,
size_t
nbValues
){
if
(
p_nbValue
==
0lu
||
p_value
==
NULL
||
tabValue
==
NULL
||
nbValues
==
0lu
)
return
;
if
(
p_value
==
NULL
||
tabValue
==
NULL
||
nbValues
==
0lu
)
return
;
for
(
size_t
i
(
0lu
);
i
<
nbValues
;
++
i
){
addValue
(
tabValue
[
i
]);
}
...
...
@@ -130,7 +130,7 @@ void PHistogram<T>::addValue(const T * tabValue, size_t nbValues){
*/
template
<
typename
T
>
void
PHistogram
<
T
>::
setValueRange
(
const
T
*
tabValue
,
size_t
nbValues
){
if
(
p_nbValue
==
0lu
||
p_value
==
NULL
||
tabValue
==
NULL
||
nbValues
==
0lu
)
return
;
if
(
p_value
==
NULL
||
tabValue
==
NULL
||
nbValues
==
0lu
)
return
;
pminmaxTab
(
p_xMin
,
p_xMax
,
tabValue
,
nbValues
);
setRange
(
p_xMin
,
p_xMax
);
reset
();
...
...
@@ -143,7 +143,7 @@ void PHistogram<T>::setValueRange(const T * tabValue, size_t nbValues){
*/
template
<
typename
T
>
void
PHistogram
<
T
>::
addAmplitude
(
T
value
,
T
amplitude
){
if
(
p_nbValue
==
0
||
p_value
==
NULL
)
return
;
if
(
p_value
==
NULL
)
return
;
if
(
value
>=
p_xMax
||
value
<
p_xMin
){
if
(
value
>=
p_xMax
)
++
p_overXMax
;
if
(
value
<
p_xMin
)
++
p_underXMin
;
...
...
@@ -170,10 +170,10 @@ void PHistogram<T>::loadBins(const T* tabValues, size_t nbValues){
///Fonction qui normalise le PHistogram
template
<
typename
T
>
void
PHistogram
<
T
>::
normalize
(){
if
(
p_value
==
NULL
||
p_nbValue
==
0
)
return
;
if
(
p_value
==
NULL
)
return
;
T
coef
(((
p_nbTirIn
)
*
p_xRange
)
/
((
T
)
p_nbValue
));
if
(
coef
==
0.0
)
return
;
for
(
size_t
i
(
0
);
i
<
p_nbValue
;
++
i
){
for
(
size_t
i
(
0
lu
);
i
<
p_nbValue
;
++
i
){
p_value
[
i
]
/=
coef
;
}
}
...
...
@@ -238,6 +238,7 @@ void PHistogram<T>::allocateHist(size_t nbValue){
delete
[]
p_value
;
}
p_nbValue
=
nbValue
;
if
(
nbValue
==
0lu
){
return
;}
p_value
=
new
T
[
p_nbValue
];
}
...
...
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