Bug fix on eliminating code pairs that cannot meet threshold

jeffsvajlenko · Apr 18, 2022 · 5e2b1ba · 5e2b1ba
1 parent ef79322
commit 5e2b1ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/internal/detection/detection.go b/internal/detection/detection.go
@@ -44,12 +44,10 @@ func DetectClones(pset *parsing.ParseSet, threshold float64) (*CloneSet, error)
 
 			for j := i + 1; j < len(functions); j++ {
 				f2 := functions[j]
-				if math.Ceil(math.Max(float64(f1.LineLength), float64(f2.LineLength))*threshold) > math.Min(float64(f1.LineLength), float64(f1.LineLength)) {
-					if isClone(f1, f2, threshold) {
-						cclones <- Clone{
-							FunctionId1: f1.Id,
-							FunctionId2: f2.Id,
-						}
+				if isClone(f1, f2, threshold) {
+					cclones <- Clone{
+						FunctionId1: f1.Id,
+						FunctionId2: f2.Id,
 					}
 				}
 			}
@@ -70,6 +68,7 @@ func isClone(f1 parsing.Function, f2 parsing.Function, threshold float64) bool {
 	len2 := len(f2.PrettyPrintBody)
 	reqshared := int(math.Ceil(float64(max(len1, len2)) * threshold))
 
+	// Short circuit if not possible to satisfy threshold
 	if len1 < reqshared || len2 < reqshared {
 		return false
 	}

diff --git a/internal/parsing/parsing.go b/internal/parsing/parsing.go
@@ -184,7 +184,6 @@ func parseFile(file File, fset *token.FileSet, intern *sync.Map) ([]Function, []
 			})
 		}
 	}
-
 	return retval, errors
 }