Skip to content

Commit

Permalink
Using angle brackets for ezl includes
Browse files Browse the repository at this point in the history
  • Loading branch information
haptork committed Mar 17, 2016
1 parent 18d54c2 commit 99bcdb8
Show file tree
Hide file tree
Showing 62 changed files with 211 additions and 211 deletions.
6 changes: 3 additions & 3 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ irrespective of their case (upper or lower).

#include <boost/mpi.hpp>

#include "ezl/ezl.hpp"
#include "ezl/algorithms/readFile.hpp"
#include "ezl/algorithms/reduces.hpp"
#include <ezl/ezl.hpp>
#include <ezl/algorithms/readFile.hpp>
#include <ezl/algorithms/reduces.hpp>

int main(int argc, char* argv[]) {
using std::string;
Expand Down
2 changes: 1 addition & 1 deletion examples/AddOffset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Used with interstitialcount example.
* */
#include "AddOffset.hpp"
#include <AddOffset.hpp>

bool AddOffset::_isUnitcell(float x, float y, float z, float l,
std::array<float, 3> origin) {
Expand Down
12 changes: 6 additions & 6 deletions examples/cods2016.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
#include <algorithm>
#include <map>

#include "ezl.hpp"
#include <ezl.hpp>

#include "ezl/algorithms/filters.hpp"
#include "ezl/algorithms/maps.hpp"
#include "ezl/algorithms/readFile.hpp"
#include "ezl/algorithms/reduces.hpp"
#include "ezl/algorithms/reduceAlls.hpp"
#include <ezl/algorithms/filters.hpp>
#include <ezl/algorithms/maps.hpp>
#include <ezl/algorithms/readFile.hpp>
#include <ezl/algorithms/reduces.hpp>
#include <ezl/algorithms/reduceAlls.hpp>

using namespace std;

Expand Down
4 changes: 2 additions & 2 deletions examples/demoColumns.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/io.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/io.hpp>

// to see more on rise and loadMem, see `demoIO`
// the integers in the angular brackets after map <1, 1, 0> is bool mask select
Expand Down
6 changes: 3 additions & 3 deletions examples/demoFlow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/io.hpp"
#include "ezl/algorithms/filters.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/io.hpp>
#include <ezl/algorithms/filters.hpp>

// returns a map-flow that can be placed in a pipeline later
auto sqr() {
Expand Down
6 changes: 3 additions & 3 deletions examples/demoIO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/io.hpp"
#include "ezl/algorithms/reduces.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/io.hpp>
#include <ezl/algorithms/reduces.hpp>

int demoLoadMem(std::string outFile) {
using std::vector;
Expand Down
8 changes: 4 additions & 4 deletions examples/demoMapFilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
* */
#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/io.hpp"
#include "ezl/algorithms/filters.hpp"
#include "ezl/algorithms/maps.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/io.hpp>
#include <ezl/algorithms/filters.hpp>
#include <ezl/algorithms/maps.hpp>

class Op {
public:
Expand Down
8 changes: 4 additions & 4 deletions examples/demoPrll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@

#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/io.hpp"
#include "ezl/algorithms/reduces.hpp"
#include "ezl/algorithms/filters.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/io.hpp>
#include <ezl/algorithms/reduces.hpp>
#include <ezl/algorithms/filters.hpp>

struct hashfn {
std::size_t operator() (const std::tuple<const int&>& x) const {
Expand Down
6 changes: 3 additions & 3 deletions examples/demoReadFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/readFile.hpp"
#include "ezl/algorithms/reduces.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/readFile.hpp>
#include <ezl/algorithms/reduces.hpp>

int main(int argc, char* argv[]) {
using std::vector;
Expand Down
10 changes: 5 additions & 5 deletions examples/demoReduce.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
* */
#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/io.hpp"
#include "ezl/algorithms/readFile.hpp"
#include "ezl/algorithms/reduces.hpp"
#include "ezl/algorithms/filters.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/io.hpp>
#include <ezl/algorithms/readFile.hpp>
#include <ezl/algorithms/reduces.hpp>
#include <ezl/algorithms/filters.hpp>

auto f(char ch, int n, float f, long res) {
return res + 1;
Expand Down
8 changes: 4 additions & 4 deletions examples/demoReduceAll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
* */
#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/io.hpp"
#include "ezl/algorithms/reduceAlls.hpp"
#include "ezl/algorithms/filters.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/io.hpp>
#include <ezl/algorithms/reduceAlls.hpp>
#include <ezl/algorithms/filters.hpp>

using namespace std;

Expand Down
4 changes: 2 additions & 2 deletions examples/demoRise.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
* */
#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/io.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/io.hpp>

class Op {
public:
Expand Down
8 changes: 4 additions & 4 deletions examples/displaced.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

#include <algorithm>

#include "ezl.hpp"
#include <ezl.hpp>

#include "ezl/algorithms/filters.hpp"
#include "ezl/algorithms/reduces.hpp"
#include "ezl/algorithms/readFile.hpp"
#include <ezl/algorithms/filters.hpp>
#include <ezl/algorithms/reduces.hpp>
#include <ezl/algorithms/readFile.hpp>

auto calcDist(std::array<float, 3> p1, std::array<float, 3> p2) {
auto diff = 0.0F;
Expand Down
10 changes: 5 additions & 5 deletions examples/interstitialcount.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#include <boost/mpi.hpp>
#include <array>

#include "ezl.hpp"
#include "AddOffset.cpp"
#include <ezl.hpp>
#include <AddOffset.cpp>

#include "ezl/algorithms/reduces.hpp"
#include "ezl/algorithms/filters.hpp"
#include "ezl/algorithms/readFile.hpp"
#include <ezl/algorithms/reduces.hpp>
#include <ezl/algorithms/filters.hpp>
#include <ezl/algorithms/readFile.hpp>

int main(int argc, char* argv[]) {
boost::mpi::environment env(argc, argv);
Expand Down
10 changes: 5 additions & 5 deletions examples/logreg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

#include <algorithm>

#include "ezl.hpp"
#include <ezl.hpp>

#include "ezl/algorithms/io.hpp"
#include "ezl/algorithms/reduceAlls.hpp"
#include "ezl/algorithms/reduces.hpp"
#include "ezl/algorithms/readFile.hpp"
#include <ezl/algorithms/io.hpp>
#include <ezl/algorithms/reduceAlls.hpp>
#include <ezl/algorithms/reduces.hpp>
#include <ezl/algorithms/readFile.hpp>

using namespace std;

Expand Down
8 changes: 4 additions & 4 deletions examples/pi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/filters.hpp"
#include "ezl/algorithms/io.hpp"
#include "ezl/algorithms/reduces.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/filters.hpp>
#include <ezl/algorithms/io.hpp>
#include <ezl/algorithms/reduces.hpp>

// to facilitate random number generation
template <class T>
Expand Down
6 changes: 3 additions & 3 deletions examples/trajectory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* */
#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/reduces.hpp"
#include "ezl/algorithms/readFile.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/reduces.hpp>
#include <ezl/algorithms/readFile.hpp>

using namespace std;

Expand Down
6 changes: 3 additions & 3 deletions examples/wordcount.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

#include <boost/mpi.hpp>

#include "ezl.hpp"
#include "ezl/algorithms/readFile.hpp"
#include "ezl/algorithms/reduces.hpp"
#include <ezl.hpp>
#include <ezl/algorithms/readFile.hpp>
#include <ezl/algorithms/reduces.hpp>

int main(int argc, char* argv[]) {
using std::string;
Expand Down
14 changes: 7 additions & 7 deletions include/ezl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
#include <memory>
#include <tuple>

#include "ezl/builder/DataFlowExpr.hpp"
#include "ezl/builder/LoadBuilder.hpp"
#include "ezl/builder/LoadExpr.hpp"
#include "ezl/builder/LoadUnitBuilder.hpp"
#include "ezl/builder/LoadUnitExpr.hpp"
#include "ezl/helper/meta/slct.hpp"
#include "ezl/helper/meta/slctTuple.hpp"
#include <ezl/builder/DataFlowExpr.hpp>
#include <ezl/builder/LoadBuilder.hpp>
#include <ezl/builder/LoadExpr.hpp>
#include <ezl/builder/LoadUnitBuilder.hpp>
#include <ezl/builder/LoadUnitExpr.hpp>
#include <ezl/helper/meta/slct.hpp>
#include <ezl/helper/meta/slctTuple.hpp>

namespace ezl {

Expand Down
2 changes: 1 addition & 1 deletion include/ezl/algorithms/io.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <string>
#include <algorithm>

#include "ezl/helper/vglob.hpp"
#include <ezl/helper/vglob.hpp>

namespace ezl {
namespace detail {
Expand Down
8 changes: 4 additions & 4 deletions include/ezl/algorithms/readFile.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

#include <boost/algorithm/string.hpp>

#include "ezl/helper/meta/lexCastTuple.hpp"
#include "ezl/helper/meta/slctTuple.hpp"
#include "ezl/helper/vglob.hpp"
#include "ezl/helper/Karta.hpp"
#include <ezl/helper/meta/lexCastTuple.hpp>
#include <ezl/helper/meta/slctTuple.hpp>
#include <ezl/helper/vglob.hpp>
#include <ezl/helper/Karta.hpp>

namespace ezl {
/*!
Expand Down
34 changes: 17 additions & 17 deletions include/ezl/builder/DataFlowExpr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@

#include <boost/functional/hash.hpp>

#include "ezl/algorithms/io.hpp"
#include <ezl/algorithms/io.hpp>

#include "ezl/builder/FilterBuilder.hpp"
#include "ezl/builder/FilterExpr.hpp"
#include "ezl/builder/LoadUnitBuilder.hpp"
#include "ezl/builder/LoadUnitExpr.hpp"
#include "ezl/builder/MapBuilder.hpp"
#include "ezl/builder/MapExpr.hpp"
#include "ezl/builder/ReduceAllBuilder.hpp"
#include "ezl/builder/ReduceAllExpr.hpp"
#include "ezl/builder/ReduceBuilder.hpp"
#include "ezl/builder/ReduceExpr.hpp"
#include "ezl/builder/ParExpr.hpp"
#include "ezl/builder/DumpExpr.hpp"
#include <ezl/builder/FilterBuilder.hpp>
#include <ezl/builder/FilterExpr.hpp>
#include <ezl/builder/LoadUnitBuilder.hpp>
#include <ezl/builder/LoadUnitExpr.hpp>
#include <ezl/builder/MapBuilder.hpp>
#include <ezl/builder/MapExpr.hpp>
#include <ezl/builder/ReduceAllBuilder.hpp>
#include <ezl/builder/ReduceAllExpr.hpp>
#include <ezl/builder/ReduceBuilder.hpp>
#include <ezl/builder/ReduceExpr.hpp>
#include <ezl/builder/ParExpr.hpp>
#include <ezl/builder/DumpExpr.hpp>

#include "ezl/helper/Karta.hpp"
#include "ezl/helper/meta/slctTuple.hpp"
#include "ezl/helper/meta/slct.hpp"
#include "ezl/helper/meta/typeInfo.hpp"
#include <ezl/helper/Karta.hpp>
#include <ezl/helper/meta/slctTuple.hpp>
#include <ezl/helper/meta/slct.hpp>
#include <ezl/helper/meta/typeInfo.hpp>

namespace ezl {
namespace detail {
Expand Down
2 changes: 1 addition & 1 deletion include/ezl/builder/DumpExpr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifndef DUMPEXPR_EZL_H
#define DUMPEXPR_EZL_H

#include "ezl/mapreduce/DumpFile.hpp"
#include <ezl/mapreduce/DumpFile.hpp>

namespace ezl {
namespace detail {
Expand Down
4 changes: 2 additions & 2 deletions include/ezl/builder/FilterBuilder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#include <boost/functional/hash.hpp>

#include "ezl/helper/meta/slctTuple.hpp"
#include "ezl/helper/ProcReq.hpp"
#include <ezl/helper/meta/slctTuple.hpp>
#include <ezl/helper/ProcReq.hpp>

#define FSUPER \
DataFlowExpr< \
Expand Down
8 changes: 4 additions & 4 deletions include/ezl/builder/FilterExpr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

#include <memory>

#include "ezl/pipeline/Source.hpp"
#include "ezl/helper/meta/slct.hpp"
#include "ezl/helper/meta/typeInfo.hpp"
#include "ezl/mapreduce/Filter.hpp"
#include <ezl/pipeline/Source.hpp>
#include <ezl/helper/meta/slct.hpp>
#include <ezl/helper/meta/typeInfo.hpp>
#include <ezl/mapreduce/Filter.hpp>

namespace ezl {
namespace detail {
Expand Down
4 changes: 2 additions & 2 deletions include/ezl/builder/LoadExpr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include <memory>
#include <vector>

#include "ezl/helper/ProcReq.hpp"
#include "ezl/mapreduce/Load.hpp"
#include <ezl/helper/ProcReq.hpp>
#include <ezl/mapreduce/Load.hpp>

namespace ezl {
namespace detail {
Expand Down

0 comments on commit 99bcdb8

Please sign in to comment.