Skip to content

Commit

Permalink
misc. changes
Browse files Browse the repository at this point in the history
  • Loading branch information
atks committed Aug 7, 2016
1 parent 9558109 commit 22bcacf
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions hts_utils.cpp
Expand Up @@ -22,6 +22,7 @@
*/

#include "hts_utils.h"
#include "Rmath/Rmath.h"

/********
*General
Expand Down
1 change: 0 additions & 1 deletion hts_utils.h
Expand Up @@ -34,7 +34,6 @@
#include "htslib/faidx.h"
#include "htslib/tbx.h"
#include "htslib/hfile.h"
#include "Rmath/Rmath.h"
#include "utils.h"

/**********
Expand Down
1 change: 1 addition & 0 deletions needle.cpp
Expand Up @@ -25,6 +25,7 @@

#include <algorithm>
#include <iostream>
#include <fstream>
#include <string>

NeedlemanWunsch::NeedlemanWunsch(bool debug)
Expand Down
4 changes: 2 additions & 2 deletions normalize.cpp
Expand Up @@ -332,7 +332,7 @@ class Igor : Program
void print_options()
{
if (!print) return;

std::clog << "normalize v" << version << "\n";
std::clog << "\n";
std::clog << "options: input VCF file " << input_vcf_file << "\n";
Expand Down Expand Up @@ -395,6 +395,6 @@ bool normalize(int argc, char ** argv)
igor.initialize();
igor.normalize();
igor.print_stats();

return igor.print;
};
7 changes: 5 additions & 2 deletions program.h
Expand Up @@ -24,6 +24,8 @@
#ifndef PROGRAM_H
#define PROGRAM_H

#include <fstream>
#include <iostream>
#include <typeinfo>
#include "tclap/CmdLine.h"
#include "tclap/Arg.h"
Expand Down Expand Up @@ -58,6 +60,7 @@ class Program
public:

std::string version;
std::ofstream out;

/**
* Process arguments.
Expand Down Expand Up @@ -90,15 +93,15 @@ class Program
* @filter_string - comma delimited filters in a string
* @n - ensure that filters vector had n filters.
* if there are less, just pad with empty strings
* if there are more, thrown an error.
* if there are more, thrown an error.
* if n is 0, ignore the previous contraints.
* @pad - if there are less than expected variant expressions
* when true, the remaining filter expressions are padded with the empty string.
* when false and only one expression is observed, the remaining filter expressions
* duplicated with that filter expression.
*/
void parse_filters(std::vector<std::string>& filters, std::string filter_string, int32_t n=0, bool pad=false);

/**
* Parse a list of strings delimited by commas.
*
Expand Down

0 comments on commit 22bcacf

Please sign in to comment.