diff --git a/fermi.go b/fermi.go index 4033c3a..29575f1 100644 --- a/fermi.go +++ b/fermi.go @@ -372,6 +372,7 @@ func parseMixture(words []string, vars map[string]Dist) (Dist, error) { return nil, printAndReturnErr("Expected mixture variable but didn't get a variable. \nMixture syntax: \nmx x 2.5 y 8 z 10\ni.e.: mx var weight var2 weight2 ... var_n weight_n") } samples := dist.Samples() + // Inefficient to draw N_SAMPLES for each of the distributions, but conceptually simpler. dists = append(dists, dist) fs = append(fs, samples) } else { diff --git a/sample/sample.go b/sample/sample.go index 9ed95c8..abb3055 100644 --- a/sample/sample.go +++ b/sample/sample.go @@ -1,7 +1,6 @@ package sample import ( - "fmt" "math" "sync" @@ -181,7 +180,7 @@ func Sample_mixture_serially(fs [][]float64, weights []float64, n_samples int) ( return nil, errors.New("Cummulative sum of weights in mixture must be > 0.0") } - fmt.Printf("Weights: %v\n", cumsummed_normalized_weights) + // fmt.Printf("Weights: %v\n", cumsummed_normalized_weights) xs := make([]float64, n_samples) // var global_state = rand.New(rand.NewPCG(uint64(1), uint64(2)))