Skip to content

Commit

Permalink
Merge branch 'hotfix/v1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
JulieBvs committed Sep 1, 2021
2 parents 04af6fa + 1d51586 commit 80b571d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: scigenex
Type: Package
Title: The scigenex package (Single-Cell Informative GENe Explorer)
Version: 1.0.1
Version: 1.0.2
Date: 2020-07-22
Author: J. Bavais, Aurelie Bergon, Fabrice Lopez, Julien Textoris, Samuel Granjeaud, Lionel Spinelli and Denis Puthier
Maintainer: J. Bavais <[email protected]>
Expand Down
6 changes: 3 additions & 3 deletions R/dbfmcl_main.R
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ DBFMCL <- function(data = NULL,
filename = NULL,
path = ".",
output_path = ".",
optional_output = FALSE,
optional_output = TRUE,
mcl_cmd_line=FALSE,
mcl_cmd_line_threads=1,
name = NULL,
Expand Down Expand Up @@ -1046,7 +1046,7 @@ DBFMCL <- function(data = NULL,
DBF <- function(data,
output_path = ".",
name = NULL,
optional_output = FALSE,
optional_output = TRUE,
distance_method = c("spearman", "pearson", "euclidean"),
silent = FALSE,
k = 100,
Expand Down Expand Up @@ -1088,7 +1088,7 @@ DBF <- function(data,
# Character string containing all the options refered in the fprint_selected function in the C++ code
options <- c( "dists,thresholds")
} else {
options <- FALSE
options <- ""
}


Expand Down
7 changes: 6 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@

# Changelog

## v2.0.1
## v1.0.2

* Fix fprint_selected function in C code byt changing type of len varibale to size_t
* Set default optional_output parameter of DBF and DBFMCL function to TRUE

## v1.0.1

### Bug Fixes

Expand Down
2 changes: 1 addition & 1 deletion src/dbf.c
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ void fprint_selected( char *options, char *fr, int verbose,
char *option = NULL;
char *outputFN = NULL;
FILE *fd;
char len = 0;
size_t len = 0;

// Output file naming and opening
len = strlen( fr ) + 30;
Expand Down

0 comments on commit 80b571d

Please sign in to comment.