Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
fa66a8dc
Commit
fa66a8dc
authored
Mar 18, 2021
by
daniel.bub
Browse files
[FIX
#132
] fix regex for integer recognition
parent
685da7f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
src/modules/filterProtonData/WProtonData.cpp
src/modules/filterProtonData/WProtonData.cpp
+1
-1
src/modules/filterProtonData/WSingleSelectorName.cpp
src/modules/filterProtonData/WSingleSelectorName.cpp
+1
-0
No files found.
src/modules/filterProtonData/WProtonData.cpp
View file @
fa66a8dc
...
...
@@ -138,7 +138,7 @@ void WProtonData::detectColumnTypesFromCsvData( WDataSetCSV::ContentSPtr csvData
std
::
string
WProtonData
::
determineColumnTypeByString
(
std
::
string
cellValue
)
{
std
::
regex
regexInt
(
R"(^
-
?[[:d:]]+$)"
);
std
::
regex
regexInt
(
R"(^
[-\+]
?[[:d:]]+
([eE]\+?0?[1-9])?
$)"
);
std
::
regex
regexDouble
(
R"(^([+-]?(?:[[:d:]]+\.?|[[:d:]]*\.[[:d:]]+))(?:[Ee][+-]?[[:d:]]+)?$)"
);
if
(
std
::
regex_search
(
cellValue
,
regexInt
)
)
...
...
src/modules/filterProtonData/WSingleSelectorName.cpp
View file @
fa66a8dc
...
...
@@ -25,6 +25,7 @@
#include <list>
#include <string>
#include "WDatatype.h"
#include "WSingleSelectorName.h"
std
::
string
WSingleSelectorName
::
getX
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment