Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
vite
Commits
91caf8cb
Commit
91caf8cb
authored
Jun 23, 2014
by
Thibault Soucarre
Browse files
whitespaces cleanup
parent
5b4587a4
Changes
40
Hide whitespace changes
Inline
Side-by-side
src/trace/ContainerType.hpp
View file @
91caf8cb
...
...
@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
...
...
@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
...
...
@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
#ifndef CONTAINERTYPE_HPP
...
...
@@ -56,7 +56,7 @@ private:
ContainerType
*
_parent
;
std
::
list
<
ContainerType
*>
_children
;
public:
public:
/*!
* \fn ContainerType(Name &name, ContainerType *parent)
* \brief Constructor of ContainerType
...
...
@@ -71,30 +71,30 @@ public:
* \brief Destructor
*/
~
ContainerType
();
/*!
* \fn add_child(ContainerType *child)
* \brief Add a type of child container
* \param child Type of child container
*/
void
add_child
(
ContainerType
*
child
);
/*!
* \fn get_name()
* \brief name accessor
*/
const
Name
get_name
()
const
;
/*!
* \fn get_parent() const
* \brief Get the parent container type
*/
const
ContainerType
*
get_parent
()
const
;
/*!
* \fn get_children() const
* \brief Get the list of the child container types
*/
*/
const
std
::
list
<
ContainerType
*>
*
get_children
()
const
;
};
...
...
src/trace/Entity.cpp
View file @
91caf8cb
...
...
@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
...
...
@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
...
...
@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
...
...
@@ -56,10 +56,10 @@ using namespace std;
Entity
::
Entity
(
Container
*
container
,
map
<
std
::
string
,
Value
*>
opt
)
:
_container
(
container
)
/*, _extra_fields(opt)*/
{
if
(
opt
.
empty
())
_extra_fields
=
NULL
;
else
{
_extra_fields
=
new
map
<
std
::
string
,
Value
*>
(
opt
);
opt
.
clear
();
}
else
{
_extra_fields
=
new
map
<
std
::
string
,
Value
*>
(
opt
);
opt
.
clear
();
}
}
...
...
@@ -84,6 +84,6 @@ Entity::~Entity(){
}
void
Entity
::
clear
(){
if
(
_extra_fields
!=
NULL
)
delete
_extra_fields
;
_extra_fields
=
NULL
;
if
(
_extra_fields
!=
NULL
)
delete
_extra_fields
;
_extra_fields
=
NULL
;
}
src/trace/Entity.hpp
View file @
91caf8cb
...
...
@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
...
...
@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
...
...
@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
#ifndef ENTITY_HPP
...
...
@@ -55,7 +55,7 @@ struct Entity {
private:
Container
*
_container
;
std
::
map
<
std
::
string
,
Value
*>*
_extra_fields
;
public:
/*
* \fn Entity(Container *container, map<std::string, Value *> opt)
...
...
@@ -65,26 +65,26 @@ public:
*/
Entity
(
Container
*
container
,
std
::
map
<
std
::
string
,
Value
*>
opt
);
Entity
();
public:
public:
/*!
* \fn get_container() const
* \brief Get the container of the entity
*/
const
Container
*
get_container
()
const
;
// /*!
// * \fn set_container(Container* cont) const
// * \brief sets the container of the entity
// */
// void set_container(Container* cont) {_container=cont;}
//
//
// /*!
// * \fn set_extra_fields(std::map<std::string, Value *>* opt) const
// * \brief sets the container of the entity
// */
// void set_extra_fields(std::map<std::string, Value *>* opt) {_extra_fields=opt;}
//
//
/*!
* \fn get_extra_fields() const
* \brief Get the extra fields
...
...
@@ -93,7 +93,7 @@ public:
~
Entity
();
void
clear
();
void
clear
();
};
#endif
src/trace/EntityType.cpp
View file @
91caf8cb
...
...
@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
...
...
@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
...
...
@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
#include
<string>
...
...
@@ -53,10 +53,10 @@ using namespace std;
EntityType
::
EntityType
(
Name
name
,
ContainerType
*
container_type
,
map
<
std
::
string
,
Value
*>&
opt
)
:
_name
(
name
),
_container_type
(
container_type
)
{
if
(
opt
.
empty
())
_extra_fields
=
NULL
;
else
{
_extra_fields
=
new
map
<
std
::
string
,
Value
*>
(
opt
);
opt
.
clear
();
}
if
(
opt
.
empty
())
_extra_fields
=
NULL
;
else
{
_extra_fields
=
new
map
<
std
::
string
,
Value
*>
(
opt
);
opt
.
clear
();
}
}
...
...
@@ -65,7 +65,7 @@ EntityType::EntityType():_extra_fields(NULL)
void
EntityType
::
add_value
(
EntityValue
*
value
)
{
_values
.
insert
(
pair
<
Name
,
EntityValue
*>
(
value
->
get_name
(),
value
));
_values
.
insert
(
pair
<
Name
,
EntityValue
*>
(
value
->
get_name
(),
value
));
}
const
Name
EntityType
::
get_name
()
const
{
...
...
@@ -93,7 +93,7 @@ void EntityType::set_extra_fields(std::map<std::string, Value *>* extra_fields){
void
EntityType
::
set_values
(
std
::
map
<
Name
,
EntityValue
*
>
values
){
_values
=
values
;
}
EntityType
::~
EntityType
(){
// Destruction of the list _values
...
...
@@ -107,18 +107,17 @@ EntityType::~EntityType(){
_values
.
clear
();
_container_type
=
NULL
;
if
(
_extra_fields
!=
NULL
){
map
<
std
::
string
,
Value
*
>::
iterator
cur
=
_extra_fields
->
end
();
for
(
map
<
std
::
string
,
Value
*>::
iterator
it
=
_extra_fields
->
begin
();
it
!=
cur
;
it
++
){
delete
(
*
it
).
second
;
}
_extra_fields
->
clear
();
}
if
(
_extra_fields
!=
NULL
){
map
<
std
::
string
,
Value
*
>::
iterator
cur
=
_extra_fields
->
end
();
for
(
map
<
std
::
string
,
Value
*>::
iterator
it
=
_extra_fields
->
begin
();
it
!=
cur
;
it
++
){
delete
(
*
it
).
second
;
}
_extra_fields
->
clear
();
}
}
map
<
std
::
string
,
Value
*>
*
EntityType
::
get_extra_fields
()
const
{
return
_extra_fields
;
}
src/trace/EntityType.hpp
View file @
91caf8cb
...
...
@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
...
...
@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
...
...
@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
#ifndef ENTITYTYPE_HPP
...
...
@@ -57,7 +57,7 @@ private:
ContainerType
*
_container_type
;
std
::
map
<
Name
,
EntityValue
*
>
_values
;
std
::
map
<
std
::
string
,
Value
*>*
_extra_fields
;
protected:
/*!
* \fn EntityType(Name name, ContainerType *container_type, std::map<std::string, Value *> opt)
...
...
@@ -75,13 +75,13 @@ public:
* \brief Destructor
*/
virtual
~
EntityType
();
/*!
* \fn add_value(EntityValue *value)
* \brief Add a value for this type of entity
*/
void
add_value
(
EntityValue
*
value
);
/*!
* \fn get_name() const
* \brief Get the name of the entity type
...
...
@@ -93,26 +93,25 @@ public:
* \brief Get the type of the container
*/
const
ContainerType
*
get_container_type
()
const
;
/*!
* \fn get_values() const
* \brief Get the list of the values
*/
const
std
::
map
<
Name
,
EntityValue
*
>
*
get_values
()
const
;
/*!
* \fn get_extra_fields() const
* \brief Get the extra fields
*/
std
::
map
<
std
::
string
,
Value
*>
*
get_extra_fields
()
const
;
void
set_name
(
Name
name
);
void
set_container_type
(
ContainerType
*
container_type
);
void
set_extra_fields
(
std
::
map
<
std
::
string
,
Value
*>*
extra_fields
);
void
set_values
(
std
::
map
<
Name
,
EntityValue
*
>
values
);
};
#endif
src/trace/EntityTypes.hpp
View file @
91caf8cb
...
...
@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
...
...
@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
...
...
@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
#ifndef ENTITYTYPES_HPP
...
...
@@ -52,4 +52,3 @@
#include
"trace/VariableType.hpp"
#endif
src/trace/EntityValue.cpp
View file @
91caf8cb
...
...
@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
...
...
@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
...
...
@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
#include
<string>
...
...
src/trace/EntityValue.hpp
View file @
91caf8cb
...
...
@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
...
...
@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
...
...
@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
#ifndef ENTITYVALUE_HPP
...
...
@@ -56,8 +56,8 @@ private:
Name
_name
;
EntityType
*
_type
;
std
::
map
<
std
::
string
,
Value
*>
_opt
;
public:
public:
/*!
* \fn EntityValue(const Name &name, EntityType *type, std::map<std::string, Value *> opt);
* \brief EntityValue Constructor
...
...
@@ -67,19 +67,19 @@ public:
*/
EntityValue
(
const
Name
&
name
,
EntityType
*
type
,
std
::
map
<
std
::
string
,
Value
*>
opt
);
EntityValue
();
/*!
* \fn get_name() const
* \brief Get the name of the value
*/
Name
get_name
()
const
;
/*!
* \fn get_type() const
* \brief Get the entity type of the value
*/
const
EntityType
*
get_type
()
const
;
/*!
* \fn get_extra_fields() const
* \brief Get the extra fields
...
...
src/trace/Entitys.hpp
View file @
91caf8cb
...
...
@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
...
...
@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
...
...
@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
#ifndef ENTITYS_HPP
...
...
@@ -57,4 +57,3 @@
#include
"trace/Container.hpp"
#endif
src/trace/Event.cpp
View file @
91caf8cb
...
...
@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
...
...
@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
...
...
@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
...
...
@@ -69,4 +69,3 @@ const EventType *Event::get_type() const {
const
EntityValue
*
Event
::
get_value
()
const
{
return
_value
;
}
src/trace/Event.hpp
View file @
91caf8cb
...
...
@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
...
...
@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
...
...
@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
#ifndef EVENT_HPP
...
...
@@ -80,15 +80,15 @@ public:
/*!
* \fn get_time() const
* \brief Get the time of the event
*/
*/
Date
get_time
()
const
;
/*!
* \fn get_type() const