From 3f61255fe145fe6a4f38f5d57e3475b7753915a7 Mon Sep 17 00:00:00 2001 From: Tycho Date: Sun, 1 Mar 2015 14:27:01 +0000 Subject: Added pipelining syntax for generators --- src/Generating/BioGen.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/Generating/BioGen.cpp') diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp index 378ece6a3..a3cc20247 100644 --- a/src/Generating/BioGen.cpp +++ b/src/Generating/BioGen.cpp @@ -941,21 +941,21 @@ public: cBioGenGrown(int a_Seed) { auto FinalRivers = - std::make_shared> (a_Seed + 1, - std::make_shared> (a_Seed + 2, - std::make_shared> (a_Seed + 3, - std::make_shared> (a_Seed + 4, - std::make_shared> (a_Seed + 5, - std::make_shared> (a_Seed + 8, - std::make_shared> (a_Seed + 5, - std::make_shared> (a_Seed + 9, - std::make_shared> (a_Seed + 5, - std::make_shared> (a_Seed + 10, - std::make_shared> (a_Seed + 5, - std::make_shared> (a_Seed + 6, - std::make_shared> (a_Seed + 11, - std::make_shared>(a_Seed + 12 - )))))))))))))); + + std::make_shared>(a_Seed + 12) + >> MakeIntGen>(a_Seed + 11) + >> MakeIntGen>(a_Seed + 6) + >> MakeIntGen>(a_Seed + 5) + >> MakeIntGen>(a_Seed + 10) + >> MakeIntGen>(a_Seed + 5) + >> MakeIntGen>(a_Seed + 9) + >> MakeIntGen>(a_Seed + 5) + >> MakeIntGen>(a_Seed + 8) + >> MakeIntGen>(a_Seed + 5) + >> MakeIntGen>(a_Seed + 4) + >> MakeIntGen>(a_Seed + 3) + >> MakeIntGen>(a_Seed + 2) + >> MakeIntGen>(a_Seed + 1); auto alteration = std::make_shared>(a_Seed, -- cgit v1.2.3 From bdea6c92b32630856449962ee331fb475627e8d0 Mon Sep 17 00:00:00 2001 From: Tycho Date: Sun, 1 Mar 2015 14:51:07 +0000 Subject: Fixed Style Still fails CheckBasicStyle.lua dua to issue with rvalue references and templates --- src/Generating/BioGen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Generating/BioGen.cpp') diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp index a3cc20247..a830f6a43 100644 --- a/src/Generating/BioGen.cpp +++ b/src/Generating/BioGen.cpp @@ -942,7 +942,7 @@ public: { auto FinalRivers = - std::make_shared>(a_Seed + 12) + std::make_shared>(a_Seed + 12) >> MakeIntGen>(a_Seed + 11) >> MakeIntGen>(a_Seed + 6) >> MakeIntGen>(a_Seed + 5) -- cgit v1.2.3 From ff785188f943c0b0ab6a39aec4cf3ca4c54a2d95 Mon Sep 17 00:00:00 2001 From: Tycho Date: Tue, 10 Mar 2015 22:19:03 +0000 Subject: Fixed Sequence Generator for IntGen --- src/Generating/BioGen.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Generating/BioGen.cpp') diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp index a830f6a43..c9561cc09 100644 --- a/src/Generating/BioGen.cpp +++ b/src/Generating/BioGen.cpp @@ -1000,9 +1000,9 @@ public: std::make_shared> (a_Seed + 101, bgIce, bgTemperate, 150, std::make_shared> (a_Seed + 2000, 200, std::make_shared> (a_Seed + 9, 50, bgOcean, - std::make_shared> (a_Seed + 10, - std::make_shared> (a_Seed + 100, 30 - ))))))))))))))))))))))))))))))); + std::make_shared> (a_Seed + 100, 30) + >> MakeIntGen> (a_Seed + 10) + ))))))))))))))))))))))))))))); m_Gen = std::make_shared>(a_Seed, -- cgit v1.2.3 From 430cbb8c832af71d3a7200e6db80bf08681a7b26 Mon Sep 17 00:00:00 2001 From: tycho Date: Wed, 11 Mar 2015 10:42:45 +0000 Subject: Changed pipeline character from >> to | --- src/Generating/BioGen.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/Generating/BioGen.cpp') diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp index c9561cc09..9a7ba4d05 100644 --- a/src/Generating/BioGen.cpp +++ b/src/Generating/BioGen.cpp @@ -943,19 +943,19 @@ public: auto FinalRivers = std::make_shared>(a_Seed + 12) - >> MakeIntGen>(a_Seed + 11) - >> MakeIntGen>(a_Seed + 6) - >> MakeIntGen>(a_Seed + 5) - >> MakeIntGen>(a_Seed + 10) - >> MakeIntGen>(a_Seed + 5) - >> MakeIntGen>(a_Seed + 9) - >> MakeIntGen>(a_Seed + 5) - >> MakeIntGen>(a_Seed + 8) - >> MakeIntGen>(a_Seed + 5) - >> MakeIntGen>(a_Seed + 4) - >> MakeIntGen>(a_Seed + 3) - >> MakeIntGen>(a_Seed + 2) - >> MakeIntGen>(a_Seed + 1); + | MakeIntGen>(a_Seed + 11) + | MakeIntGen>(a_Seed + 6) + | MakeIntGen>(a_Seed + 5) + | MakeIntGen>(a_Seed + 10) + | MakeIntGen>(a_Seed + 5) + | MakeIntGen>(a_Seed + 9) + | MakeIntGen>(a_Seed + 5) + | MakeIntGen>(a_Seed + 8) + | MakeIntGen>(a_Seed + 5) + | MakeIntGen>(a_Seed + 4) + | MakeIntGen>(a_Seed + 3) + | MakeIntGen>(a_Seed + 2) + | MakeIntGen>(a_Seed + 1); auto alteration = std::make_shared>(a_Seed, @@ -1001,7 +1001,7 @@ public: std::make_shared> (a_Seed + 2000, 200, std::make_shared> (a_Seed + 9, 50, bgOcean, std::make_shared> (a_Seed + 100, 30) - >> MakeIntGen> (a_Seed + 10) + | MakeIntGen> (a_Seed + 10) ))))))))))))))))))))))))))))); m_Gen = -- cgit v1.2.3