Skip to content

Minor Fixes #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rwk-unil wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Minor Fixes #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ad6c83
Added missing std namespace tag
rwk-unil Sep 23, 2021
a241f92
Fixed dangerous macro expansions
rwk-unil Sep 23, 2021
4d7d50f
Added parentheses around assignment in if clause
rwk-unil Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/io/genotype_reader2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void genotype_reader::readGenotypes2(string funphased, string fphased) {
n_geno_mis += mi;
n_geno_ips += ph;
}
if (line_scaf=bcf_sr_get_line(sr, 1)) {
if ((line_scaf=bcf_sr_get_line(sr, 1))) {
ngt_scaf = bcf_get_genotypes(sr->readers[1].header, line_scaf, &gt_arr_scaf, &ngt_arr_scaf); assert(ngt_scaf == 2 * n_scaf_samples);
for(int i = 0 ; i < 2 * n_scaf_samples ; i += 2) {
int ind = mappingS2G[DIV2(i)];
Expand Down Expand Up @@ -380,7 +380,7 @@ void genotype_reader::readGenotypes3(string funphased, string freference, string
a0?calt++:cref++;
a1?calt++:cref++;
}
if (line_scaf=bcf_sr_get_line(sr, 2)) {
if ((line_scaf=bcf_sr_get_line(sr, 2))) {
ngt_scaf = bcf_get_genotypes(sr->readers[2].header, line_scaf, &gt_arr_scaf, &ngt_arr_scaf); assert(ngt_scaf == 2 * n_scaf_samples);
for(int i = 0 ; i < 2 * n_scaf_samples ; i += 2) {
int ind = mappingS2G[DIV2(i)];
Expand Down
4 changes: 2 additions & 2 deletions src/utils/otools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ extern "C" {
#define MAX_AMB 22

//MACROS
#define DIV2(v) (v>>1)
#define MOD2(v) (v&1)
#define DIV2(v) ((v)>>1)
#define MOD2(v) ((v)&1)

//NAMESPACE
using namespace std;
Expand Down
4 changes: 2 additions & 2 deletions src/utils/string_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ class string_utils {
template < class T >
std::string str(T n, int prec = -1) {
std::ostringstream ss( std::stringstream::out );
if (prec >= 0) { ss << setiosflags( std::ios::fixed ); ss.precision(prec); }
if (prec >= 0) { ss << std::setiosflags( std::ios::fixed ); ss.precision(prec); }
ss << n;
return ss.str();
}

template < class T >
std::string str(std::vector < T > & v, int prec = -1) {
std::ostringstream ss( std::stringstream::out );
if (prec >= 0) { ss << setiosflags( std::ios::fixed ); ss.precision(prec); }
if (prec >= 0) { ss << std::setiosflags( std::ios::fixed ); ss.precision(prec); }
for (int e = 0 ; e < v.size() ; e ++) ss << (e>0?" ":"") << v[e] ;
return ss.str();
}
Expand Down