Commit 66334b8a authored by Alvarez, Gonzalo's avatar Alvarez, Gonzalo
Browse files

InputNg::Writable ctor can take data from string

parent 4ef444a0

drivers/make.pl

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ use Make; 
my @drivers = ("integrator","sparseSolverTest", "testCRSMatrix", "rungeKuttaTest", "combineContinuedFraction",

"continuedFractionCollection", "gitrev", "jsonExample", "range",

"kernelPolynomial", "linearPrediction", "options", "randomTest", "svd", "testLapack", "threads",

"testIsClass","testMemResolv1","sumDecomposition","calculator","closuresTest");

"testIsClass","testMemResolv1","sumDecomposition","calculator","closuresTest","base64test");



my $lapack = Make::findLapack();

Make::backupMakefile();

lib/configure.pl

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ sub createMakefile 


	local *FH = $fh;

	my @units = ("MersenneTwister","Matrix","Mpi","ApplicationInfo","Concurrency",

	"ProgressIndicator","Tokenizer","MemResolv","PsimagLite");

	"ProgressIndicator","Tokenizer","MemResolv","PsimagLite","PsiBase64");

	my $combinedUnits = combine("",\@units,".o ");

	my $combinedUnits2 = combine("../src/",\@units,".cpp ");

src/InputNg.h

+20 −0
Original line number Diff line number Diff line
@@ -185,7 +185,27 @@ public: 
				printMap(mapStrVec_,"StrVec");

				std::cout<<"END\n";

			}

		}



		Writeable(const String& data, const InputCheckType& inputCheck, int)

		    : data_(data),

		      line_(0),

		      state_(IN_LABEL),

		      numericVector_(0),

		      lastLabel_(""),

		      file_("-"),

		      inputCheck_(inputCheck),

		      verbose_(false)

		{

			check();



			if (verbose_) {

				std::cout<<"START\n";

				printMap(mapStrStr_,"StrStr");

				std::cout<<"END\nSTART\n";

				printMap(mapStrVec_,"StrVec");

				std::cout<<"END\n";

			}

		}



		void set(MapStrStrType& mapStrStr,