Skip to content

Commit

Permalink
Release 0.3.1.2 for DSC_TIME variable
Browse files Browse the repository at this point in the history
  • Loading branch information
gaow committed Dec 3, 2018
1 parent 726562d commit a7ea323
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dscrutils/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: dscrutils
Encoding: UTF-8
Type: Package
Version: 0.3.1.1
Version: 0.3.1.2
Date: 2018-02-21
Title: Dynamic Statistical Comparisons R Interface
Authors@R: c(person("Gao","Wang",role=c("aut","cre"),
Expand Down
15 changes: 9 additions & 6 deletions dscrutils/R/dscquery.R
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,16 @@ dscquery <- function (dsc.outdir, targets, conditions = NULL, groups = NULL,
stop(paste("Unable to read",dscfile,"because it does not exist"))
}
out <- read_dsc(dscfile)
if (var != 'DSC_TIME') {
# Check that the variable is one of the outputs in the file.
if (!is.element(var,names(out)))
stop(paste0("Output \"",var,"\" unavailable in ",dscfile))

# Check that the variable is one of the outputs in the file.
if (!is.element(var,names(out)))
stop(paste0("Output \"",var,"\" unavailable in ",dscfile))

# Extract the value of the variable.
out[[var]]
# Extract the value of the variable.
out[[var]]
} else {
out$DSC_DEBUG$time$elapsed
}
}, mc.cores = detectCores())

# If all the available values are atomic, not NULL, and scalar
Expand Down
2 changes: 2 additions & 0 deletions src/query_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ def check_table_field(self, value, check_field = 0):
keys_lower = [k.lower() for k in self.data.keys()]
if not x.lower() in keys_lower:
raise DBError(f"Cannot find module ``{x}`` in DSC results ``{self.db}``.")
if y == 'DSC_TIME':
return
k = list(self.data.keys())[keys_lower.index(x.lower())]
y_low = y.lower()
if y_low == 'dsc_replicate':
Expand Down
2 changes: 1 addition & 1 deletion src/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.3.1.1'
__version__ = '0.3.1.2'

0 comments on commit a7ea323

Please sign in to comment.