Added --silent option for support

evolbioinfo · Mar 1, 2017 · 25a4a8a · 25a4a8a
1 parent 2d76afb
commit 25a4a8a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/cmd/booster.go b/cmd/booster.go
@@ -22,7 +22,7 @@ var boosterCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		writeLogBooster()
 		rand.Seed(boosterSeed)
-		t, err := support.Booster(supportIntree, supportBoottrees, supportLog, boosterEmpirical, rootCpus)
+		t, err := support.Booster(supportIntree, supportBoottrees, supportLog, supportSilent, boosterEmpirical, rootCpus)
 		if err != nil {
 			io.ExitWithMessage(err)
 		}

diff --git a/cmd/classical.go b/cmd/classical.go
@@ -34,6 +34,7 @@ Cobra is a CLI library for Go that empowers applications.
 This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
 	Run: func(cmd *cobra.Command, args []string) {
+		writeLogClassical()
 		t, e := support.Classical(supportIntree, supportBoottrees, rootCpus)
 		if e != nil {
 			io.ExitWithMessage(e)

diff --git a/cmd/support.go b/cmd/support.go
@@ -13,6 +13,7 @@ var supportOutFile string
 var supportLogFile string
 var supportOut *os.File
 var supportLog *os.File
+var supportSilent bool
 
 // supportCmd represents the support command
 var supportCmd = &cobra.Command{
@@ -57,4 +58,5 @@ func init() {
 	supportCmd.PersistentFlags().StringVarP(&supportBoottrees, "bootstrap", "b", "none", "Bootstrap trees input file")
 	supportCmd.PersistentFlags().StringVarP(&supportOutFile, "out", "o", "stdout", "Output tree file, with supports")
 	supportCmd.PersistentFlags().StringVarP(&supportLogFile, "log-file", "l", "stderr", "Output log file")
+	supportCmd.PersistentFlags().BoolVar(&supportSilent, "silent", false, "If true, progress messages will not be printed to stderr")
 }
diff --git a/support/booster.go b/support/booster.go
@@ -17,6 +17,7 @@ type BoosterSupporter struct {
 	currentTree           int
 	mutex                 *sync.Mutex
 	stop                  bool
+	silent                bool
 }
 
 func (supporter *BoosterSupporter) ExpectedRandValues(depth int) float64 {
@@ -246,7 +247,9 @@ func (supporter *BoosterSupporter) ComputeValue(refTree *tree.Tree, empiricalTre
 	var nb_branches_close int
 	for treeV := range bootTreeChannel {
 		nb_branches_close = 0
-		fmt.Fprintf(os.Stderr, "CPU : %d - Bootstrap tree %d\n", cpu, treeV.Id)
+		if !supporter.silent {
+			fmt.Fprintf(os.Stderr, "CPU : %d - Bootstrap tree %d\n", cpu, treeV.Id)
+		}
 		bootEdges := treeV.Tree.Edges()
 
 		for i, _ := range edges {
@@ -329,12 +332,14 @@ func (supporter *BoosterSupporter) ComputeValue(refTree *tree.Tree, empiricalTre
 	return nil
 }
 
-func Booster(reftreefile, boottreefile string, logfile *os.File, empirical bool, cpus int) (*tree.Tree, error) {
+func Booster(reftreefile, boottreefile string, logfile *os.File, silent bool, empirical bool, cpus int) (*tree.Tree, error) {
 	var supporter *BoosterSupporter = &BoosterSupporter{}
+	supporter.silent = silent
 	return ComputeSupport(reftreefile, boottreefile, logfile, empirical, cpus, supporter)
 }
-func BoosterFile(reftreefile, boottreefile *bufio.Reader, logfile *os.File, empirical bool, cpus int) (*tree.Tree, error) {
+func BoosterFile(reftreefile, boottreefile *bufio.Reader, logfile *os.File, silent bool, empirical bool, cpus int) (*tree.Tree, error) {
 	var supporter *BoosterSupporter = &BoosterSupporter{}
+	supporter.silent = silent
 	return ComputeSupportFile(reftreefile, boottreefile, logfile, empirical, cpus, supporter)
 }