From d1badbab4dee51debf57582db755214bb419d9d5 Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 11 Aug 2005 15:25:47 +0000 Subject: [PATCH] Use the split_string_list function just imported into Utilities. git-svn-id: https://svn.dealii.org/trunk@11288 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/source/function_parser.cc | 58 ++++---------------------- 1 file changed, 7 insertions(+), 51 deletions(-) diff --git a/deal.II/base/source/function_parser.cc b/deal.II/base/source/function_parser.cc index a7acdb95d4..d0e2d20a3f 100644 --- a/deal.II/base/source/function_parser.cc +++ b/deal.II/base/source/function_parser.cc @@ -12,6 +12,7 @@ //--------------------------------------------------------------------------- #include +#include #include #include @@ -29,45 +30,6 @@ namespace fparser -// Utility to split a string given a delimiter. - -unsigned int SplitString(const std::string& input, - const std::string& delimiter, - std::vector& results) -{ - // Size of the delimiter. Use it to calculate the offsets between - // different pieces of the string - unsigned int sizeS2 = delimiter.size(); - // Counter for Current Position - unsigned int iPos = 0; - // Counter for Position of next delimiter - std::string::size_type newPos = 0; - // Counter for Number of strings - unsigned int numFound = 0; - - while( newPos != std::string::npos ) - { - // Look for a delimiter starting with the correct offset. Note - // that if it is the beginning of the cycle the offset is zero. - newPos = input.find (delimiter, iPos); - // We either found a delimiter inside the string or the - // delimiter was not found. Increment the found counter anyway, - // as if there are no delimiters, we return one vector - // containing exacly one string anyway - numFound++; - // Add the string we just found to the output vector - Assert(iPos <= input.size(), ExcInternalError()); - results.push_back(input.substr(iPos, newPos-iPos)); - // Update the current position with the correct offset. - iPos = newPos+sizeS2; - } - // At least we found one string and no delimiters. - Assert(numFound > 0, ExcInternalError()); - return numFound; -} - - - template FunctionParser::FunctionParser(const unsigned int n_components, const double initial_time) @@ -167,19 +129,13 @@ void FunctionParser::initialize (const std::string variables, const bool time_dependent, const bool use_degrees) { - // Start up with an empty vector of - // expressions. - std::vector expressions; - - // In this case a vector function - // is built with the number of - // components found between the - // separators ';' - SplitString (expression, ";", expressions); - // Now initialize with the things + // initialize with the things // we got. - initialize (variables, expressions, constants, - time_dependent, use_degrees); + initialize (variables, + Utilities::split_string_list (expression, ';'), + constants, + time_dependent, + use_degrees); } -- 2.39.5