about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederick Muriuki Muriithi2022-05-27 12:00:51 +0300
committerFrederick Muriuki Muriithi2022-05-27 12:00:51 +0300
commitc3ff4b25ebf190712dbe911a79a87bd5eb55e7c2 (patch)
tree4f92911a7a0d0bb3b727598c8ce2226630977d56
parent960c1a5b831d8761a3e1716f86ded4cc5b67eea0 (diff)
downloadgn-uploader-c3ff4b25ebf190712dbe911a79a87bd5eb55e7c2.tar.gz
Revert "Accept exponential notation for standard-error files"
This reverts commit 960c1a5b831d8761a3e1716f86ded4cc5b67eea0.

After meeting with Arthur, it was confirmed that the CSV file should
not have values in the exponential notation.
-rw-r--r--README.org7
-rw-r--r--quality_control/standard_error.py2
2 files changed, 4 insertions, 5 deletions
diff --git a/README.org b/README.org
index 818f9d5..55e70df 100644
--- a/README.org
+++ b/README.org
@@ -19,10 +19,9 @@ following criteria:
 - No empty data cells
 - no data cells with spurious characters like `eeeee`, `5.555iloveguix`, etc.
 - decimal numbers must conform to the following criteria:
-  - when checking an average file decimal numbers must contain exactly three places to the right side of the dot.
-  - when checking a standard error file decimal numbers must contain six or greater places to the right side of the dot.
-  - there must be a number to the left side of the dot (e.g. 0.55555 is allowed but .55555 is not).
-  - when checking the standard error file, also accept exponential notation with at least 6 decimal places e.g. 0.3423452E-13
+-   - when checking an average file decimal numbers must contain exactly three places to the right side of the dot.
+-   - when checking a standard error file decimal numbers must contain six or greater places to the right side of the dot.
+-   - there must be a number to the left side of the dot (e.g. 0.55555 is allowed but .55555 is not).
 - check line endings to make sure they are Unix and not DOS
 - check strain headers against a source of truth (see strains.csv)
 
diff --git a/quality_control/standard_error.py b/quality_control/standard_error.py
index 5489ade..c866993 100644
--- a/quality_control/standard_error.py
+++ b/quality_control/standard_error.py
@@ -12,7 +12,7 @@ def invalid_value(
     `val` is not a valid input for standard error files, otherwise, it returns
     `None`.
     """
-    if re.search(r"(^[0-9]+\.[0-9]{6,}$|^[0-9]+\.[0-9]{6,}[eE]-[0-9]+$)", val):
+    if re.search(r"^[0-9]+\.[0-9]{6,}$", val):
         return None
     return InvalidValue(
         line_number, column_number, val, (