From 3f61255fe145fe6a4f38f5d57e3475b7753915a7 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Sun, 1 Mar 2015 14:27:01 +0000
Subject: Added pipelining syntax for generators

---
 src/Generating/BioGen.cpp | 30 ++++++++++++++---------------
 src/Generating/IntGen.h   | 49 ++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 16 deletions(-)

(limited to 'src/Generating')

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<cIntGenSmooth<8>>   (a_Seed + 1,
-			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 2,
-			std::make_shared<cIntGenRiver <7>>   (a_Seed + 3,
-			std::make_shared<cIntGenZoom  <9>>   (a_Seed + 4,
-			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
-			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 8,
-			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
-			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 9,
-			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
-			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 10,
-			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
-			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 6,
-			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 11,
-			std::make_shared<cIntGenChoice<2, 7>>(a_Seed + 12
-		))))))))))))));
+		
+			std::make_shared<cIntGenChoice<2, 7>>(a_Seed + 12) 
+			>> MakeIntGen<cIntGenZoom  <10>>(a_Seed + 11)
+			>> MakeIntGen<cIntGenSmooth<8>>(a_Seed + 6)
+			>> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+			>> MakeIntGen<cIntGenZoom  <8>>(a_Seed + 10)
+			>> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+			>> MakeIntGen<cIntGenZoom  <8>>(a_Seed + 9)
+			>> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+			>> MakeIntGen<cIntGenZoom  <8>>(a_Seed + 8)
+			>> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+			>> MakeIntGen<cIntGenZoom  <9>>(a_Seed + 4)
+			>> MakeIntGen<cIntGenRiver <7>>(a_Seed + 3)
+			>> MakeIntGen<cIntGenZoom  <10>>(a_Seed + 2)
+			>> MakeIntGen<cIntGenSmooth<8>>(a_Seed + 1);
 
 		auto alteration =
 			std::make_shared<cIntGenZoom     <8>>(a_Seed,
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index b25e378c0..be005b314 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -31,6 +31,8 @@ by using templates.
 
 #include "../BiomeDef.h"
 
+#include <tuple>
+
 
 
 
@@ -53,6 +55,9 @@ template <int SizeX, int SizeZ = SizeX>
 class cIntGen
 {
 public:
+
+	typedef cIntGen<SizeX, SizeZ> IntGenType;
+
 	/** Force a virtual destructor in all descendants.
 	Descendants contain virtual functions and are referred to via pointer-to-base, so they need a virtual destructor. */
 	virtual ~cIntGen() {}
@@ -62,9 +67,51 @@ public:
 
 	/** Generates the array of templated size into a_Values, based on given min coords. */
 	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) = 0;
+	
+};
+
+template<size_t size, class... Args>
+struct PackToInt {
+	enum {
+		value = size - sizeof...(Args),
+	};
+};
+
+template<class Gen, class... Args>
+class cIntGenFactory {
+	
+public:
+
+	typedef Gen Generator;
+
+	cIntGenFactory(Args&&... a_args) :
+		m_args(std::make_tuple<Args...>(std::forward<Args>(a_args)...))
+	{
+	}
+	
+	//X >> Y
+	//Y(X)
+	//cIntGenFactory<cIntGenZoom<10, 10>, int>::construct<std::shared_ptr<cIntGenChoice<2, 7, 7> > >
+	
+	template<class LhsGen>
+	std::shared_ptr<Gen> construct(LhsGen&& lhs) {
+		return std::make_shared<Gen>(std::get<PackToInt<sizeof...(Args), Args>::value>(m_args)..., std::forward<LhsGen>(lhs));
+	}
+
+private:
+	std::tuple<Args...> m_args;
+	
 };
 
+template<class T, class RhsGen, class... Args>
+std::shared_ptr<RhsGen> operator>> (std::shared_ptr<T> lhs, cIntGenFactory<RhsGen, Args...> rhs) {
+	return rhs.construct(static_cast<std::shared_ptr<typename T::IntGenType>>(lhs));
+}
 
+template<class Gen, class... Args>
+cIntGenFactory<Gen, Args...> MakeIntGen(Args&&... args) {
+	return cIntGenFactory<Gen, Args...>(std::forward<Args>(args)...);
+}
 
 
 
@@ -688,7 +735,7 @@ public:
 			int IdxZ = z * SizeX;
 			for (int x = 0; x < SizeX; x++)
 			{
-				int val = a_Values[x + IdxZ];
+				size_t val = (size_t)a_Values[x + IdxZ];
 				const cBiomesInGroups & Biomes = (val > bgfRare) ?
 					rareBiomesInGroups[(val & (bgfRare - 1)) % ARRAYCOUNT(rareBiomesInGroups)] :
 					biomesInGroups[val % ARRAYCOUNT(biomesInGroups)];
-- 
cgit v1.2.3


From bdea6c92b32630856449962ee331fb475627e8d0 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
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 +-
 src/Generating/IntGen.h   | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'src/Generating')

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<cIntGenChoice<2, 7>>(a_Seed + 12) 
+			std::make_shared<cIntGenChoice<2, 7>>(a_Seed + 12)
 			>> MakeIntGen<cIntGenZoom  <10>>(a_Seed + 11)
 			>> MakeIntGen<cIntGenSmooth<8>>(a_Seed + 6)
 			>> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index be005b314..4fce3ba08 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -71,14 +71,17 @@ public:
 };
 
 template<size_t size, class... Args>
-struct PackToInt {
-	enum {
+struct PackToInt
+{
+	enum
+	{
 		value = size - sizeof...(Args),
 	};
 };
 
 template<class Gen, class... Args>
-class cIntGenFactory {
+class cIntGenFactory
+{
 	
 public:
 
@@ -88,13 +91,10 @@ public:
 		m_args(std::make_tuple<Args...>(std::forward<Args>(a_args)...))
 	{
 	}
-	
-	//X >> Y
-	//Y(X)
-	//cIntGenFactory<cIntGenZoom<10, 10>, int>::construct<std::shared_ptr<cIntGenChoice<2, 7, 7> > >
-	
-	template<class LhsGen>
-	std::shared_ptr<Gen> construct(LhsGen&& lhs) {
+
+	template <class LhsGen>
+	std::shared_ptr<Gen> construct(LhsGen&& lhs)
+	{
 		return std::make_shared<Gen>(std::get<PackToInt<sizeof...(Args), Args>::value>(m_args)..., std::forward<LhsGen>(lhs));
 	}
 
@@ -104,12 +104,14 @@ private:
 };
 
 template<class T, class RhsGen, class... Args>
-std::shared_ptr<RhsGen> operator>> (std::shared_ptr<T> lhs, cIntGenFactory<RhsGen, Args...> rhs) {
+std::shared_ptr<RhsGen> operator>> (std::shared_ptr<T> lhs, cIntGenFactory<RhsGen, Args...> rhs)
+{
 	return rhs.construct(static_cast<std::shared_ptr<typename T::IntGenType>>(lhs));
 }
 
 template<class Gen, class... Args>
-cIntGenFactory<Gen, Args...> MakeIntGen(Args&&... args) {
+cIntGenFactory<Gen, Args...> MakeIntGen(Args&&... args)
+{
 	return cIntGenFactory<Gen, Args...>(std::forward<Args>(args)...);
 }
 
-- 
cgit v1.2.3


From ff785188f943c0b0ab6a39aec4cf3ca4c54a2d95 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Tue, 10 Mar 2015 22:19:03 +0000
Subject: Fixed Sequence Generator for IntGen

---
 src/Generating/BioGen.cpp |  6 +++---
 src/Generating/IntGen.h   | 30 +++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'src/Generating')

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<cIntGenReplaceRandomly<6>> (a_Seed + 101, bgIce, bgTemperate, 150,
 			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2000, 200,
 			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 9, 50, bgOcean,
-			std::make_shared<cIntGenZoom           <6>> (a_Seed + 10,
-			std::make_shared<cIntGenLandOcean      <5>> (a_Seed + 100, 30
-		)))))))))))))))))))))))))))))));
+			std::make_shared<cIntGenLandOcean      <5>> (a_Seed + 100, 30)
+			>> MakeIntGen<cIntGenZoom           <6>> (a_Seed + 10)
+		)))))))))))))))))))))))))))));
 
 		m_Gen =
 			std::make_shared<cIntGenSmooth   <16>>(a_Seed,
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 4fce3ba08..1ffc15c6b 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -70,15 +70,20 @@ public:
 	
 };
 
-template<size_t size, class... Args>
-struct PackToInt
-{
-	enum
-	{
-		value = size - sizeof...(Args),
-	};
+// Code adapted from http://stackoverflow.com/questions/7858817/unpacking-a-tuple-to-call-a-matching-function-pointer
+
+template<int ...>
+struct seq { };
+
+template<int N, int ...S>
+struct gens : gens<N-1, N-1, S...> { };
+
+template<int ...S>
+struct gens<0, S...> {
+  typedef seq<S...> type;
 };
 
+
 template<class Gen, class... Args>
 class cIntGenFactory
 {
@@ -91,16 +96,23 @@ public:
 		m_args(std::make_tuple<Args...>(std::forward<Args>(a_args)...))
 	{
 	}
-
+	
 	template <class LhsGen>
 	std::shared_ptr<Gen> construct(LhsGen&& lhs)
 	{
-		return std::make_shared<Gen>(std::get<PackToInt<sizeof...(Args), Args>::value>(m_args)..., std::forward<LhsGen>(lhs));
+		return construct_impl<LhsGen>(std::forward<LhsGen>(lhs), typename gens<sizeof...(Args)>::type());
 	}
 
+
 private:
 	std::tuple<Args...> m_args;
 	
+	template <class LhsGen, int... S>
+	std::shared_ptr<Gen> construct_impl(LhsGen&& lhs, seq<S...>)
+	{
+		return std::make_shared<Gen>(std::get<S>(m_args)..., std::forward<LhsGen>(lhs));
+	}
+	
 };
 
 template<class T, class RhsGen, class... Args>
-- 
cgit v1.2.3


From 8646e95b6f91942e7741830dc057daa0e9a40aed Mon Sep 17 00:00:00 2001
From: tycho <tycho@localhost>
Date: Wed, 11 Mar 2015 10:39:49 +0000
Subject: Fixed style and removed false positives Relaxed the rules for <
 followed by an && and removed rule for < following an &&

---
 src/Generating/IntGen.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/Generating')

diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 1ffc15c6b..fac500fa8 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -73,14 +73,19 @@ public:
 // Code adapted from http://stackoverflow.com/questions/7858817/unpacking-a-tuple-to-call-a-matching-function-pointer
 
 template<int ...>
-struct seq { };
+struct seq
+{
+};
 
 template<int N, int ...S>
-struct gens : gens<N-1, N-1, S...> { };
+struct gens : gens<N-1, N-1, S...>
+{
+};
 
 template<int ...S>
-struct gens<0, S...> {
-  typedef seq<S...> type;
+struct gens<0, S...>
+{
+	typedef seq<S...> type;
 };
 
 
-- 
cgit v1.2.3


From 430cbb8c832af71d3a7200e6db80bf08681a7b26 Mon Sep 17 00:00:00 2001
From: tycho <tycho@localhost>
Date: Wed, 11 Mar 2015 10:42:45 +0000
Subject: Changed pipeline character from >> to |

---
 src/Generating/BioGen.cpp | 28 ++++++++++++++--------------
 src/Generating/IntGen.h   |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/Generating')

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<cIntGenChoice<2, 7>>(a_Seed + 12)
-			>> MakeIntGen<cIntGenZoom  <10>>(a_Seed + 11)
-			>> MakeIntGen<cIntGenSmooth<8>>(a_Seed + 6)
-			>> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
-			>> MakeIntGen<cIntGenZoom  <8>>(a_Seed + 10)
-			>> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
-			>> MakeIntGen<cIntGenZoom  <8>>(a_Seed + 9)
-			>> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
-			>> MakeIntGen<cIntGenZoom  <8>>(a_Seed + 8)
-			>> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
-			>> MakeIntGen<cIntGenZoom  <9>>(a_Seed + 4)
-			>> MakeIntGen<cIntGenRiver <7>>(a_Seed + 3)
-			>> MakeIntGen<cIntGenZoom  <10>>(a_Seed + 2)
-			>> MakeIntGen<cIntGenSmooth<8>>(a_Seed + 1);
+			| MakeIntGen<cIntGenZoom  <10>>(a_Seed + 11)
+			| MakeIntGen<cIntGenSmooth<8>>(a_Seed + 6)
+			| MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+			| MakeIntGen<cIntGenZoom  <8>>(a_Seed + 10)
+			| MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+			| MakeIntGen<cIntGenZoom  <8>>(a_Seed + 9)
+			| MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+			| MakeIntGen<cIntGenZoom  <8>>(a_Seed + 8)
+			| MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+			| MakeIntGen<cIntGenZoom  <9>>(a_Seed + 4)
+			| MakeIntGen<cIntGenRiver <7>>(a_Seed + 3)
+			| MakeIntGen<cIntGenZoom  <10>>(a_Seed + 2)
+			| MakeIntGen<cIntGenSmooth<8>>(a_Seed + 1);
 
 		auto alteration =
 			std::make_shared<cIntGenZoom     <8>>(a_Seed,
@@ -1001,7 +1001,7 @@ public:
 			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2000, 200,
 			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 9, 50, bgOcean,
 			std::make_shared<cIntGenLandOcean      <5>> (a_Seed + 100, 30)
-			>> MakeIntGen<cIntGenZoom           <6>> (a_Seed + 10)
+			| MakeIntGen<cIntGenZoom           <6>> (a_Seed + 10)
 		)))))))))))))))))))))))))))));
 
 		m_Gen =
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index fac500fa8..113c2de15 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -121,7 +121,7 @@ private:
 };
 
 template<class T, class RhsGen, class... Args>
-std::shared_ptr<RhsGen> operator>> (std::shared_ptr<T> lhs, cIntGenFactory<RhsGen, Args...> rhs)
+std::shared_ptr<RhsGen> operator| (std::shared_ptr<T> lhs, cIntGenFactory<RhsGen, Args...> rhs)
 {
 	return rhs.construct(static_cast<std::shared_ptr<typename T::IntGenType>>(lhs));
 }
-- 
cgit v1.2.3


From 7089b6803055791a60b1d2f80e0490154bc64e5c Mon Sep 17 00:00:00 2001
From: worktycho <work.tycho@gmail.com>
Date: Sat, 21 Mar 2015 19:45:01 +0000
Subject: Style fixes

---
 src/Generating/IntGen.h | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/Generating')

diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 113c2de15..854563f41 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -72,20 +72,20 @@ public:
 
 // Code adapted from http://stackoverflow.com/questions/7858817/unpacking-a-tuple-to-call-a-matching-function-pointer
 
-template<int ...>
-struct seq
+template<int... >
+struct sSeq
 {
 };
 
-template<int N, int ...S>
-struct gens : gens<N-1, N-1, S...>
+template<int N, int... S>
+struct sGens : sGens<N - 1, N - 1, S...>
 {
 };
 
-template<int ...S>
-struct gens<0, S...>
+template<int... S>
+struct sGens<0, S...>
 {
-	typedef seq<S...> type;
+	typedef sSeq<S...> type;
 };
 
 
@@ -103,9 +103,9 @@ public:
 	}
 	
 	template <class LhsGen>
-	std::shared_ptr<Gen> construct(LhsGen&& lhs)
+	std::shared_ptr<Gen> construct(LhsGen&& a_Lhs)
 	{
-		return construct_impl<LhsGen>(std::forward<LhsGen>(lhs), typename gens<sizeof...(Args)>::type());
+		return construct_impl<LhsGen>(std::forward<LhsGen>(a_Lhs), typename sGens<sizeof...(Args)>::type());
 	}
 
 
@@ -113,23 +113,23 @@ private:
 	std::tuple<Args...> m_args;
 	
 	template <class LhsGen, int... S>
-	std::shared_ptr<Gen> construct_impl(LhsGen&& lhs, seq<S...>)
+	std::shared_ptr<Gen> construct_impl(LhsGen&& a_Lhs, sSeq<S...>)
 	{
-		return std::make_shared<Gen>(std::get<S>(m_args)..., std::forward<LhsGen>(lhs));
+		return std::make_shared<Gen>(std::get<S>(m_args)..., std::forward<LhsGen>(a_Lhs));
 	}
 	
 };
 
 template<class T, class RhsGen, class... Args>
-std::shared_ptr<RhsGen> operator| (std::shared_ptr<T> lhs, cIntGenFactory<RhsGen, Args...> rhs)
+std::shared_ptr<RhsGen> operator| (std::shared_ptr<T> a_Lhs, cIntGenFactory<RhsGen, Args...> a_Rhs)
 {
-	return rhs.construct(static_cast<std::shared_ptr<typename T::IntGenType>>(lhs));
+	return a_Rhs.construct(static_cast<std::shared_ptr<typename T::IntGenType>>(a_Lhs));
 }
 
 template<class Gen, class... Args>
-cIntGenFactory<Gen, Args...> MakeIntGen(Args&&... args)
+cIntGenFactory<Gen, Args...> MakeIntGen(Args&&... a_Args)
 {
-	return cIntGenFactory<Gen, Args...>(std::forward<Args>(args)...);
+	return cIntGenFactory<Gen, Args...>(std::forward<Args>(a_Args)...);
 }
 
 
-- 
cgit v1.2.3