Skip to content

Commit

Permalink
Fixed regression in mmixedOrder()
Browse files Browse the repository at this point in the history
  • Loading branch information
jmw86069 committed Jul 1, 2024
1 parent 5e69623 commit 613b12f
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: jamba
Title: Jam Base Methods
Version: 0.0.100.900
Version: 0.0.101.900
Authors@R: person(given="James M.", family="Ward",
email="jmw86069@gmail.com", role=c("aut", "cre"))
Description: Jam Base methods. Efficient alphanumeric sort for vector,
Expand Down
9 changes: 9 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# jamba 0.0.101.900

## Bug fixes

* `mmixedOrder()`

* Fixed mis-placed parentheses in conditional statement, affecting only
`factor` columns. Apparently introduced with `0.0.100.900` below.

# jamba 0.0.100.900

## Bug fixes
Expand Down
4 changes: 2 additions & 2 deletions R/jamba-mixedSort.R
Original file line number Diff line number Diff line change
Expand Up @@ -822,8 +822,8 @@ mmixedOrder <- function
}
if (is.numeric(i) ||
any(c("numeric", "POSIXct", "POSIXt", "Date") %in% class(i)) ||
(any(c("factor", "ordered") %in% class(i) &&
TRUE %in% honorFactor))) {
(any(c("factor", "ordered") %in% class(i)) &&
TRUE %in% honorFactor)) {
as.numeric(i) * iSign;
} else {
x2u <- unique(i);
Expand Down
32 changes: 32 additions & 0 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
# TODO for jamba

## 20jun2024

* `setPrompt()`

* consider option to include date and/or date-time stamp.
Similar to a bash prompt style.
Current default:
`{project-name}-R-4.2.3_processid>`
Suggested date option 1:
`{project-name}-{20jun2024}-R-4.2.3_processid>`
Suggested datetime option 1:
`{project-name}-{20jun2024}-R-4.2.3_processid>`


* Side notes for available date string options for `POSIXct`, `POSIXt`:

* `%c` uses full time and date: `"Sun Jun 9 01:45:53 2024"`
* `%H` is the hour in 24H scale with leading zero
* `%I` is the hour in 12H scale with leading zero
* `%p` indicates `"AM"` or `"PM"`
* (Is there no representation for AM/PM?)
* `%M` is the minute with leading zero
* `%S` is the second with leading zero
* `%T` is equivalent to `"%H:%M:%S"`
* `%t` is replaced by a `tab`

* `getDate()`

* Consider allowing `dateFormat` to be a jam option:
`options("jam.dateFormat")`.
Bonus point if `asDate()` can recognize a variety of common formats.

## 04jun2024

* DONE. `heatmap_column_order()`, `heatmap_row_order()`
Expand Down

0 comments on commit 613b12f

Please sign in to comment.