Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NP_TMcode
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Giacomo Mulas
NP_TMcode
Commits
5335116a
Commit
5335116a
authored
1 year ago
by
Giovanni La Mura
Browse files
Options
Downloads
Patches
Plain Diff
Use string concatenation in exception messages
parent
7002255c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/include/List.h
+24
-34
24 additions, 34 deletions
src/include/List.h
src/libnptm/Configuration.cpp
+2
-2
2 additions, 2 deletions
src/libnptm/Configuration.cpp
with
26 additions
and
36 deletions
src/include/List.h
+
24
−
34
View file @
5335116a
...
...
@@ -12,39 +12,29 @@
*/
class
ListOutOfBoundsException
:
public
std
::
exception
{
protected:
//! \brief Minimum index defined in the List.
int
min_index
;
//! \brief Maximum index defined in the List.
int
max_index
;
//! \brief List index requested by user.
int
requested_index
;
//! Description of the problem.
std
::
string
message
;
public:
/**
* \brief Exception instance constructor.
*
* \param requested: `int` The index that was requested.
* \param min: `int` The minimum index allowed by the list.
* \param max: `int` The maximum index allowed by the list.
*/
ListOutOfBoundsException
(
int
requested
,
int
min
,
int
max
)
{
min_index
=
min
;
max_index
=
max
;
requested_index
=
requested
;
}
/**
* \brief Exception message.
*/
virtual
const
char
*
what
()
const
throw
()
{
std
::
string
message
=
"Error: requested index "
;
message
+=
requested_index
;
message
+=
" is out of range ["
;
message
+=
min_index
;
message
+=
", "
;
message
+=
(
max_index
-
1
);
message
+=
"]"
;
return
message
.
c_str
();
}
/**
* \brief Exception instance constructor.
*
* \param requested: `int` The index that was requested.
* \param min: `int` The minimum index allowed by the list.
* \param max: `int` The maximum index allowed by the list.
*/
ListOutOfBoundsException
(
int
requested
,
int
min
,
int
max
)
{
message
=
"Error: requested index "
+
std
::
to_string
(
requested
)
+
" out of list allowed bounds ["
+
std
::
to_string
(
min
)
+
", "
+
std
::
to_string
(
max
-
1
)
+
"]"
;
}
/**
* \brief Exception message.
*/
virtual
const
char
*
what
()
const
throw
()
{
return
message
.
c_str
();
}
};
/**
...
...
@@ -62,7 +52,7 @@ public:
* a contiguous array of type T[SIZE] that can be used for indexed access.
*/
template
<
class
T
>
class
List
{
protected:
protected:
int
size
;
//!< Size of the List.
struct
element
{
T
value
;
//!< Value of the list element.
...
...
@@ -72,7 +62,7 @@ template<class T> class List {
*
first
,
//!< Pointer to the first element in the List.
*
last
;
//!< Pointer to the last element in the List.
public
:
public
:
/*! \brief List constructor.
*
* Use the constructor `List<T>([int length])` to create a new list with a given
...
...
@@ -176,7 +166,7 @@ template<class T> class List {
*/
void
set
(
int
index
,
T
value
)
{
if
(
index
<
0
||
index
>
size
-
1
)
{
throw
ListOutOfBoundsException
(
index
,
0
,
size
-
1
);
throw
ListOutOfBoundsException
(
index
,
0
,
size
-
1
);
}
current
=
last
;
for
(
int
i
=
size
-
1
;
i
>
index
;
i
--
)
current
=
current
->
p_prev
;
...
...
This diff is collapsed.
Click to expand it.
src/libnptm/Configuration.cpp
+
2
−
2
View file @
5335116a
...
...
@@ -265,7 +265,7 @@ ScattererConfiguration* ScattererConfiguration::from_binary(string file_name, st
try
{
xi_vec
=
new
double
[
nxi
]();
}
catch
(
const
bad_alloc
&
ex
)
{
throw
UnrecognizedConfigurationException
(
"Wrong parameter set: invalid number of scales "
+
nxi
);
throw
UnrecognizedConfigurationException
(
"Wrong parameter set: invalid number of scales "
+
to_string
(
nxi
)
)
;
}
for
(
int
i
=
0
;
i
<
nxi
;
i
++
)
{
input
.
read
(
reinterpret_cast
<
char
*>
(
&
(
xi_vec
[
i
])),
sizeof
(
double
));
...
...
@@ -285,7 +285,7 @@ ScattererConfiguration* ScattererConfiguration::from_binary(string file_name, st
try
{
rcf_vector
[
i115
-
1
]
=
new
double
[
nsh
]();
}
catch
(
const
bad_alloc
&
ex
)
{
throw
UnrecognizedConfigurationException
(
"Wrong parameter set: invalid number of layers "
+
nsh
);
throw
UnrecognizedConfigurationException
(
"Wrong parameter set: invalid number of layers "
+
to_string
(
nsh
)
)
;
}
for
(
int
nsi
=
0
;
nsi
<
nsh
;
nsi
++
)
{
input
.
read
(
reinterpret_cast
<
char
*>
(
&
(
rcf_vector
[
i115
-
1
][
nsi
])),
sizeof
(
double
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment