..

google · Jan 22, 2025 · 0c9bcaf · 0c9bcaf
2 parents 58017b3 + 51d41ed
commit 0c9bcaf
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/go/data/study.go b/go/data/study.go
@@ -1084,11 +1084,7 @@ func (s *Study) ViewEachReference(f func(*Reference) error) error {
 }
 
 // Copy inserts some reference into a study, and copies the audio files of the references and their distortions, assuming they are relative to the provided directory.
-<<<<<<< HEAD
 func (s *Study) Copy(dir string, refs []*Reference, minMOS float64, mosScaler func(float64) float64, progress func(int, int, int)) error {
-=======
-func (s *Study) Copy(dir string, refs []*Reference, minMOS float64, progress func(int, int, int)) error {
->>>>>>> 51d41ed (Added option to filter out low quality distortions when sampling one dataset to another.)
 	for index, ref := range refs {
 		refCopy := &Reference{}
 		*refCopy = *ref
@@ -1099,11 +1095,7 @@ func (s *Study) Copy(dir string, refs []*Reference, minMOS float64, progress fun
 		}
 		for index, dist := range ref.Distortions {
 			distCopy := &Distortion{}
-<<<<<<< HEAD
 			if mosScaler == nil || mosScaler(distCopy.Scores[MOS]) >= minMOS {
-=======
-			if distCopy.Scores[MOS] >= minMOS {
->>>>>>> 51d41ed (Added option to filter out low quality distortions when sampling one dataset to another.)
 				*distCopy = *dist
 				newDistPath := fmt.Sprintf("%v_%v", filepath.Base(dir), filepath.Base(dist.Path))
 				distCopy.Path = newDistPath