Revert "#3"

This reverts commit c0a713e.
RGLab · Jan 12, 2018 · 591e906 · 591e906
1 parent c0a713e
commit 591e906
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 26 deletions.
diff --git a/inst/include/cytolib/GatingHierarchy.hpp b/inst/include/cytolib/GatingHierarchy.hpp
@@ -89,8 +89,6 @@ struct OurVertexPropertyWriterR {
 
 class GatingHierarchy{
 private:
-	unsigned short g_loglevel;// debug print is turned off by default
-
 	compensation comp; /*< compensation object */
 
 	/* compensation is currently done in R due to the linear Algebra
@@ -106,7 +104,7 @@ class GatingHierarchy{
 
 public:
 
-	void set_loglevel(unsigned short _g_loglevel){g_loglevel = _g_loglevel;};
+
 
 	/**
 	 * load the in-memory copy of frm
@@ -340,7 +338,7 @@ class GatingHierarchy{
 		 * , customized copy and assignment constructor is required
 		 *
 		 */
-	GatingHierarchy(const GatingHierarchy & _gh):g_loglevel(NO_LOG)
+	GatingHierarchy(const GatingHierarchy & _gh)
 	{
 		comp = _gh.comp;
 
@@ -367,8 +365,8 @@ class GatingHierarchy{
 	 * 	GatingHierarchy *curGh=new GatingHierarchy();
 	 * \endcode
 	 */
-	GatingHierarchy():g_loglevel(NO_LOG){}
-	GatingHierarchy(compensation _comp, PARAM_VEC _transFlag, trans_local _trans):g_loglevel(NO_LOG),comp(_comp), transFlag(_transFlag),trans(_trans) {};
+	GatingHierarchy(){}
+	GatingHierarchy(compensation _comp, PARAM_VEC _transFlag, trans_local _trans):comp(_comp), transFlag(_transFlag),trans(_trans) {};
 	void convertToPb(pb::GatingHierarchy & gh_pb){
 		pb::populationTree * ptree = gh_pb.mutable_tree();
 		/*
@@ -404,7 +402,7 @@ class GatingHierarchy{
 
 	}
 
-	GatingHierarchy(pb::GatingHierarchy & pb_gh, map<intptr_t, transformation *> & trans_tbl):g_loglevel(NO_LOG){
+	GatingHierarchy(pb::GatingHierarchy & pb_gh, map<intptr_t, transformation *> & trans_tbl){
 		const pb::populationTree & tree_pb =  pb_gh.tree();
 		int nNodes = tree_pb.node_size();
 

diff --git a/inst/include/cytolib/GatingSet.hpp b/inst/include/cytolib/GatingSet.hpp
@@ -31,7 +31,6 @@ using namespace std;
  *
  */
 class GatingSet{
-	unsigned short g_loglevel;// debug print is turned off by default
 
 	biexpTrans globalBiExpTrans; //default bi-exponential transformation functions
 	linTrans globalLinTrans;
@@ -53,13 +52,6 @@ class GatingSet{
 			 return ghs.find(sampleName);
 	 }
 	 size_t erase ( const string& k ){return ghs.erase(k);}
-
-	 void set_loglevel(unsigned short _g_loglevel){
-		 g_loglevel = _g_loglevel;
-		 for(auto & it :ghs)
-			 it.second.set_loglevel(_g_loglevel);
-	 };
-	 unsigned short get_loglevel(){return g_loglevel;};
 	 /**
 	  * insert
 	  * @param sampleName
@@ -130,7 +122,7 @@ class GatingSet{
 
 	}
 
-	GatingSet():g_loglevel(NO_LOG){};
+	GatingSet(){};
 
 	/**
 	 * separate filename from dir to avoid to deal with path parsing in c++
@@ -212,7 +204,7 @@ class GatingSet{
 	 * @param format
 	 * @param isPB
 	 */
-	GatingSet(string filename):g_loglevel(NO_LOG)
+	GatingSet(string filename)
 	{
 		GOOGLE_PROTOBUF_VERIFY_VERSION;
 		ifstream input(filename.c_str(), ios::in | ios::binary);
@@ -431,7 +423,7 @@ class GatingSet{
 	 * compensation and transformation,more options can be allowed in future like providing different
 	 * comp and trans
 	 */
-	GatingSet(const GatingHierarchy & gh_template,vector<string> sampleNames):g_loglevel(NO_LOG){
+	GatingSet(const GatingHierarchy & gh_template,vector<string> sampleNames){
 
 
 
@@ -466,7 +458,7 @@ class GatingSet{
 		}
 	}
 
-	GatingSet(vector<string> sampleNames):g_loglevel(NO_LOG){
+	GatingSet(vector<string> sampleNames){
 		vector<string>::iterator it;
 		for(it=sampleNames.begin();it!=sampleNames.end();it++)
 		{

diff --git a/inst/include/cytolib/global.hpp b/inst/include/cytolib/global.hpp
@@ -8,13 +8,13 @@
 #ifndef GLOBAL_HPP_
 #define GLOBAL_HPP_
 
-enum loglevel_t{
-	NO_LOG = 0,
-	GATING_SET_LEVEL = 1,
-	GATING_HIERARCHY_LEVEL = 2,
-	POPULATION_LEVEL = 3,
-	GATE_LEVEL = 4
-	};
+#define GATING_SET_LEVEL 1
+#define GATING_HIERARCHY_LEVEL 2
+#define POPULATION_LEVEL 3
+#define GATE_LEVEL 4
+
+extern unsigned short g_loglevel;
+extern bool my_throw_on_error;
 
 #ifdef ROUT
 #include <R_ext/Print.h>
@@ -27,6 +27,8 @@ enum loglevel_t{
 #include <vector>
 using namespace std;
 
+extern unsigned short g_loglevel;// debug print is turned off by default
+extern bool my_throw_on_error;//can be toggle off to get a partially parsed gating tree for debugging purpose
 
 inline void PRINT(string a){
 #ifdef ROUT