From a3ee18e9bf1935a9e704f62bc62777d933b9e207 Mon Sep 17 00:00:00 2001 From: gdd Date: Fri, 18 Feb 2011 09:21:21 +0000 Subject: [PATCH] Remove empty directory --- src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx | 10 +++++----- src/PluginUtils/EMPTY | 0 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 src/PluginUtils/EMPTY diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx index 32a96d7..2488854 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx @@ -496,12 +496,12 @@ void BLSURFPlugin_Hypothesis_i::SetAttractorEntry(const char* entry, const char* MESSAGE("ENGINE : SETATTRACTOR START ENTRY : " << entry); bool valueChanged = false; try { - valueChanged = (this->GetImpl()->GetAttractorEntry(entry) != attractor); - if (valueChanged) { - boost::regex re("^ATTRACTOR\\((?:(-?0(\\.\\d*)*|-?[1-9]+\\d*(\\.\\d*)*|-?\\.(\\d)+);){5}(True|False)\\)$"); + valueChanged = ( this->GetImpl()->GetAttractorEntry(entry) != attractor ); + if ( valueChanged ) { + //boost::regex re("^ATTRACTOR\\((?:(-?0(\\.\\d*)*|-?[1-9]+\\d*(\\.\\d*)*|-?\\.(\\d)+);){5}(True|False)\\)$"); + boost::regex re("^ATTRACTOR\\((?:(-?0(\\.\\d*)*|-?[1-9]+\\d*(\\.\\d*)*|-?\\.(\\d)+);){5}(True|False)(?:;(-?0(\\.\\d*)*|-?[1-9]+\\d*(\\.\\d*)*|-?\\.(\\d)+))?\\)$"); if (!boost::regex_match(string(attractor), re)) - throw std::invalid_argument( - "Error: an attractor is defined with the following pattern: ATTRACTOR(xa;ya;za;a;b;True|False)"); + throw std::invalid_argument("Error: an attractor is defined with the following pattern: ATTRACTOR(xa;ya;za;a;b;True|False;d(opt.))"); this->GetImpl()->SetAttractorEntry(entry, attractor); } } catch (const std::invalid_argument& ex) { diff --git a/src/PluginUtils/EMPTY b/src/PluginUtils/EMPTY deleted file mode 100644 index e69de29..0000000 -- 2.39.2