Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
cortes_c
src
Commits
8e45602d
Commit
8e45602d
authored
Aug 02, 2018
by
snuverink_j
Browse files
replace usage of boost foreach with c++11 range for-loop
parent
f3be7763
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
21 additions
and
51 deletions
+21
-51
optimizer/Comm/Splitter/GeometricStrategy.h
optimizer/Comm/Splitter/GeometricStrategy.h
+3
-6
optimizer/Comm/Splitter/RandomStrategy.h
optimizer/Comm/Splitter/RandomStrategy.h
+1
-4
optimizer/Expression/Expression.h
optimizer/Expression/Expression.h
+0
-1
optimizer/Expression/FromFile.h
optimizer/Expression/FromFile.h
+1
-3
optimizer/Expression/Parser/evaluator.cpp
optimizer/Expression/Parser/evaluator.cpp
+2
-4
optimizer/Expression/Parser/requirements.hpp
optimizer/Expression/Parser/requirements.hpp
+2
-3
optimizer/Expression/SumErrSq.h
optimizer/Expression/SumErrSq.h
+1
-3
optimizer/Optimizer/EA/FixedPisaNsga2.tcc
optimizer/Optimizer/EA/FixedPisaNsga2.tcc
+1
-3
optimizer/Optimizer/EA/Population.h
optimizer/Optimizer/EA/Population.h
+2
-4
optimizer/Tests/OpalInputFileParserTest.cpp
optimizer/Tests/OpalInputFileParserTest.cpp
+1
-3
optimizer/Util/CommentAnnotatedInputFileParser.cpp
optimizer/Util/CommentAnnotatedInputFileParser.cpp
+4
-7
optimizer/Util/Statistics.h
optimizer/Util/Statistics.h
+2
-7
optimizer/Util/Trace/Trace.h
optimizer/Util/Trace/Trace.h
+1
-3
No files found.
optimizer/Comm/Splitter/GeometricStrategy.h
View file @
8e45602d
...
...
@@ -4,9 +4,6 @@
#include <set>
#include <vector>
#include "boost/foreach.hpp"
#define foreach BOOST_FOREACH
#include "Comm/Splitter/SplitStrategy.h"
typedef
std
::
vector
<
int
>
coordinates_t
;
...
...
@@ -52,12 +49,12 @@ public:
}
// 3. Compute centroids of partition and assign master
for
each
(
region_t
&
region
,
regions_
)
{
for
(
region_t
&
region
:
regions_
)
{
computeCentroid
(
region
);
}
// 4. Create communicator groups
for
each
(
region_t
&
region
,
regions_
)
{
for
(
region_t
&
region
:
regions_
)
{
bool
is_worker
=
false
;
coordinates_t
iter
=
region
.
origin
;
...
...
@@ -107,7 +104,7 @@ protected:
int
split_in_direction
=
0
;
int
max_ext_dir
=
0
;
for
each
(
region_t
region
,
regions_
)
{
for
(
region_t
region
:
regions_
)
{
for
(
int
dim
=
0
;
dim
<
topology_
.
getNumDimensions
();
dim
++
)
{
if
(
region
.
extensions
[
dim
]
>
max_ext_dir
)
{
split_in_direction
=
dim
;
...
...
optimizer/Comm/Splitter/RandomStrategy.h
View file @
8e45602d
...
...
@@ -5,9 +5,6 @@
#include "Comm/Splitter/SplitStrategy.h"
#include "boost/foreach.hpp"
#define foreach BOOST_FOREACH
#include <boost/random/mersenne_twister.hpp>
#include <boost/random/uniform_int_distribution.hpp>
...
...
@@ -41,7 +38,7 @@ public:
int
num_assigned_masters
=
0
;
// assign workers uniform at random to each master
for
each
(
int
master_pid
,
master_pids
)
{
for
(
int
master_pid
:
master_pids
)
{
if
(
master_pid
==
rank_
)
role_
=
Role_t
.
POLLER
;
...
...
optimizer/Expression/Expression.h
View file @
8e45602d
...
...
@@ -14,7 +14,6 @@
#include "Expression/Parser/skipper.hpp"
#include "Expression/Parser/function.hpp"
#include <boost/foreach.hpp>
#include <boost/function.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/variant/get.hpp>
...
...
optimizer/Expression/FromFile.h
View file @
8e45602d
...
...
@@ -11,8 +11,6 @@
#include "boost/variant/get.hpp"
#include "boost/variant/variant.hpp"
#include "boost/smart_ptr.hpp"
#include "boost/foreach.hpp"
#define foreach BOOST_FOREACH
#include "Util/Types.h"
#include "Util/OptPilotException.h"
...
...
@@ -43,7 +41,7 @@ struct FromFile {
return
boost
::
make_tuple
(
0.0
,
false
);
}
for
each
(
double
obj_value
,
values_
)
for
(
double
obj_value
:
values_
)
sum
+=
obj_value
;
return
boost
::
make_tuple
(
sum
,
is_valid
);
...
...
optimizer/Expression/Parser/evaluator.cpp
View file @
8e45602d
...
...
@@ -4,7 +4,6 @@
=============================================================================*/
#include "evaluator.hpp"
#include <boost/foreach.hpp>
#include <boost/variant/apply_visitor.hpp>
namespace
client
{
namespace
code_gen
{
...
...
@@ -101,8 +100,7 @@ namespace client { namespace code_gen {
bool
StackEvaluator
::
operator
()(
ast
::
function_call
const
&
x
)
{
BOOST_FOREACH
(
ast
::
function_call_argument
const
&
arg
,
x
.
args
)
{
for
(
ast
::
function_call_argument
const
&
arg
:
x
.
args
)
{
if
(
!
boost
::
apply_visitor
(
*
this
,
arg
))
return
false
;
}
...
...
@@ -135,7 +133,7 @@ namespace client { namespace code_gen {
if
(
!
boost
::
apply_visitor
(
*
this
,
x
.
first
))
return
false
;
BOOST_FOREACH
(
ast
::
operation
const
&
oper
,
x
.
rest
)
{
for
(
ast
::
operation
const
&
oper
:
x
.
rest
)
{
if
(
!
(
*
this
)(
oper
))
return
false
;
}
...
...
optimizer/Expression/Parser/requirements.hpp
View file @
8e45602d
...
...
@@ -60,8 +60,7 @@ namespace client { namespace code_gen
bool
operator
()(
ast
::
function_call
const
&
x
)
{
functions_
.
insert
(
x
.
function_name
.
name
);
BOOST_FOREACH
(
ast
::
function_call_argument
const
&
arg
,
x
.
args
)
{
for
(
ast
::
function_call_argument
const
&
arg
:
x
.
args
)
{
if
(
!
boost
::
apply_visitor
(
*
this
,
arg
))
return
false
;
//if (!(*this)(arg))
...
...
@@ -75,7 +74,7 @@ namespace client { namespace code_gen
if
(
!
boost
::
apply_visitor
(
*
this
,
x
.
first
))
return
false
;
BOOST_FOREACH
(
ast
::
operation
const
&
oper
,
x
.
rest
)
{
for
(
ast
::
operation
const
&
oper
:
x
.
rest
)
{
if
(
!
(
*
this
)(
oper
))
return
false
;
}
...
...
optimizer/Expression/SumErrSq.h
View file @
8e45602d
...
...
@@ -10,8 +10,6 @@
#include "boost/variant/get.hpp"
#include "boost/variant/variant.hpp"
#include "boost/smart_ptr.hpp"
#include "boost/foreach.hpp"
#define foreach BOOST_FOREACH
#include "Util/Types.h"
#include "Util/SDDSReader.h"
...
...
@@ -58,7 +56,7 @@ struct SumErrSq {
double
sum
=
0
;
for
each
(
Measurement
measurement
,
measurements_
)
{
for
(
Measurement
measurement
:
measurements_
)
{
double
sim_value
=
0.0
;
try
{
sim_stats
->
getInterpolatedValue
(
...
...
optimizer/Optimizer/EA/FixedPisaNsga2.tcc
View file @
8e45602d
...
...
@@ -11,8 +11,6 @@
#include <sys/stat.h>
#include "boost/algorithm/string.hpp"
#include "boost/foreach.hpp"
#define foreach BOOST_FOREACH
#include <boost/archive/text_oarchive.hpp>
#include <boost/archive/text_iarchive.hpp>
...
...
@@ -209,7 +207,7 @@ bool FixedPisaNsga2<CO, MO>::onMessage(MPI_Status status, size_t length) {
delete[] buffer;
std::set<unsigned int> new_state_ids;
for
each
(individual ind
,
new_states) {
for
(individual ind
:
new_states) {
// only insert individual if not already in population
if(variator_m->population()->isRepresentedInPopulation(ind.genes))
...
...
optimizer/Optimizer/EA/Population.h
View file @
8e45602d
...
...
@@ -11,8 +11,6 @@
#include <fstream>
#include "boost/smart_ptr.hpp"
#include "boost/foreach.hpp"
#define foreach BOOST_FOREACH
#include "extlib/wfgHypervolume/hypervolume.h"
...
...
@@ -116,7 +114,7 @@ public:
void
commit_individuals
(
std
::
set
<
unsigned
int
>
ids
)
{
for
each
(
unsigned
int
id
,
ids
)
{
for
(
unsigned
int
id
:
ids
)
{
//std::cout << "--+ committing id = " << id << "\xd";
individual
ind
=
get_staging
(
id
);
individuals
.
insert
(
ind_t
(
id
,
ind
));
...
...
@@ -150,7 +148,7 @@ public:
//XXX: currently O(n): add a fast look-up table?
bool
isRepresentedInPopulation
(
genes_t
ind_genes
)
{
for
each
(
ind_t
ind
,
individuals
)
{
for
(
ind_t
ind
:
individuals
)
{
if
(
ind_genes
==
ind
.
second
->
genes
)
return
true
;
}
...
...
optimizer/Tests/OpalInputFileParserTest.cpp
View file @
8e45602d
...
...
@@ -6,8 +6,6 @@
#include "boost/smart_ptr.hpp"
#include "boost/tuple/tuple.hpp"
#include "boost/foreach.hpp"
#define foreach BOOST_FOREACH
namespace
{
...
...
@@ -80,7 +78,7 @@ namespace {
names
.
push_back
(
"obj1"
);
names
.
push_back
(
"ob3"
);
names
.
push_back
(
"o2"
);
for
each
(
Expressions
::
SingleNamed_t
expr
,
obj
)
{
for
(
Expressions
::
SingleNamed_t
expr
:
obj
)
{
std
::
string
expected_name
=
names
.
back
();
EXPECT_EQ
(
expected_name
,
expr
.
first
);
names
.
pop_back
();
...
...
optimizer/Util/CommentAnnotatedInputFileParser.cpp
View file @
8e45602d
...
...
@@ -4,7 +4,6 @@
#include "boost/algorithm/string.hpp"
#include "boost/tuple/tuple.hpp"
#include "boost/foreach.hpp"
#include "Expression/SumErrSq.h"
#include "Expression/FromFile.h"
...
...
@@ -12,8 +11,6 @@
#include "CommentAnnotatedInputFileParser.h"
#include "Util/OptPilotException.h"
#define foreach BOOST_FOREACH
typedef
std
::
pair
<
std
::
string
,
DVar_t
>
namedDVar_t
;
CommentAnnotatedInputFileParser
::
CommentAnnotatedInputFileParser
(
...
...
@@ -31,17 +28,17 @@ void CommentAnnotatedInputFileParser::getProblem(Expressions::Named_t &objective
Expressions
::
Named_t
&
constraints
,
DVarContainer_t
&
dvars
)
{
for
each
(
Expressions
::
SingleNamed_t
obj
,
nobjectives_
)
{
for
(
Expressions
::
SingleNamed_t
obj
:
nobjectives_
)
{
if
(
objectives_
.
count
(
obj
.
first
)
>
0
)
objectives
.
insert
(
Expressions
::
SingleNamed_t
(
obj
.
first
,
obj
.
second
));
}
for
each
(
Expressions
::
SingleNamed_t
constr
,
nconstraints_
)
{
for
(
Expressions
::
SingleNamed_t
constr
:
nconstraints_
)
{
if
(
constraints_
.
count
(
constr
.
first
)
>
0
)
constraints
.
insert
(
Expressions
::
SingleNamed_t
(
constr
.
first
,
constr
.
second
));
}
for
each
(
namedDVar_t
dvar
,
ndvars_
)
{
for
(
namedDVar_t
dvar
:
ndvars_
)
{
if
(
dvars_
.
count
(
dvar
.
first
)
>
0
)
dvars
.
insert
(
namedDVar_t
(
dvar
.
first
,
dvar
.
second
));
}
...
...
@@ -137,7 +134,7 @@ std::set<std::string> CommentAnnotatedInputFileParser::getListAttribute(
boost
::
token_compress_on
);
std
::
set
<
std
::
string
>
ret
;
for
each
(
std
::
string
list_attribute_name
,
attributes
)
{
for
(
std
::
string
list_attribute_name
:
attributes
)
{
boost
::
trim
(
list_attribute_name
);
ret
.
insert
(
list_attribute_name
);
}
...
...
optimizer/Util/Statistics.h
View file @
8e45602d
...
...
@@ -5,9 +5,6 @@
#include <string>
#include <iostream>
#include "boost/foreach.hpp"
#define foreach BOOST_FOREACH
template
<
typename
T
>
class
Statistics
{
...
...
@@ -42,8 +39,7 @@ public:
std
::
cout
<<
"Statistics: "
<<
stat_name_
<<
std
::
endl
;
T
sum
=
0
;
std
::
pair
<
std
::
string
,
T
>
stat
;
foreach
(
stat
,
statistics_
)
{
for
(
std
::
pair
<
std
::
string
,
T
>
stat
:
statistics_
)
{
sum
+=
stat
.
second
;
std
::
cout
<<
"
\t
"
<<
stat
.
first
<<
" = "
<<
stat
.
second
<<
std
::
endl
;
}
...
...
@@ -56,8 +52,7 @@ public:
stream
<<
"Statistics: "
<<
stat_name_
<<
std
::
endl
;
T
sum
=
0
;
std
::
pair
<
std
::
string
,
T
>
stat
;
foreach
(
stat
,
statistics_
)
{
for
(
std
::
pair
<
std
::
string
,
T
>
stat
:
statistics_
)
{
sum
+=
stat
.
second
;
stream
<<
"
\t
"
<<
stat
.
first
<<
" = "
<<
stat
.
second
<<
std
::
endl
;
}
...
...
optimizer/Util/Trace/Trace.h
View file @
8e45602d
...
...
@@ -7,8 +7,6 @@
#include <map>
#include "boost/smart_ptr.hpp"
#include "boost/foreach.hpp"
#define foreach BOOST_FOREACH
#include "Util/Trace/TraceComponent.h"
...
...
@@ -35,7 +33,7 @@ public:
}
void
log
(
std
::
ostringstream
&
dump
)
{
for
each
(
boost
::
shared_ptr
<
TraceComponent
>
component
,
pipeline_
)
{
for
(
boost
::
shared_ptr
<
TraceComponent
>
component
:
pipeline_
)
{
component
->
execute
(
dump
);
}
}
...
...
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