Merge pull request #352 from symflower/350-early-merger

Clarify wording, logs, debugging regarding symflower fix
symflower · Oct 2, 2024 · 3438679 · 3438679
2 parents 4a9fc7d + 027facf
commit 3438679
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/evaluate/evaluate_test.go b/evaluate/evaluate_test.go
@@ -144,7 +144,7 @@ func TestEvaluate(t *testing.T) {
 				return nil
 			}))
 
-			assert.ElementsMatch(t, tc.ExpectedAssessments, actualAssessments)
+			assert.Equal(t, tc.ExpectedAssessments.ToMap(), actualAssessments.ToMap())
 			assert.Equal(t, tc.ExpectedTotalScore, actualTotalScore)
 
 			if tc.ExpectedOutputValidate != nil {

diff --git a/evaluate/task/symflower-fix.go → evaluate/task/symflower.go b/evaluate/task/symflower-fix.go → evaluate/task/symflower.go
diff --git a/evaluate/task/task-transpile.go b/evaluate/task/task-transpile.go
@@ -132,7 +132,7 @@ func (t *TaskTranspile) Run(ctx evaltask.Context) (repositoryAssessment map[eval
 						continue
 					} else {
 						testsPassing := withSymflowerFixTestResult.TestsPass
-						taskLogger.Printf("Executes tests with %d tests passing after \"symflower fix\"", testsPassing)
+						taskLogger.Printf("with symflower repair: Executes tests with %d tests passing", testsPassing)
 
 						// Symflower was able to fix a failure so now update the assessment with the improved results.
 						withSymflowerFixAssessments := metrics.NewAssessments()

diff --git a/evaluate/task/task-write-test.go b/evaluate/task/task-write-test.go
@@ -47,15 +47,15 @@ func (t *TaskWriteTests) Run(ctx evaltask.Context) (repositoryAssessment map[eva
 	}
 
 	modelAssessment := metrics.NewAssessments()
-	withSymflowerAssessment := metrics.NewAssessments()
+	withSymflowerFixAssessment := metrics.NewAssessments()
 
 	maximumReachableFiles := uint64(len(filePaths))
 	modelAssessment[metrics.AssessmentKeyFilesExecutedMaximumReachable] = maximumReachableFiles
-	withSymflowerAssessment[metrics.AssessmentKeyFilesExecutedMaximumReachable] = maximumReachableFiles
+	withSymflowerFixAssessment[metrics.AssessmentKeyFilesExecutedMaximumReachable] = maximumReachableFiles
 
 	for _, filePath := range filePaths {
 		modelAssessmentForFile := metrics.NewAssessments()
-		withSymflowerAssessmentForFile := modelAssessmentForFile // The symflower assessment tracks how the model result can be improved in case of a failure, so just link to the model assessment until a failure actually happens.
+		withSymflowerFixAssessmentForFile := modelAssessmentForFile // The symflower assessment tracks how the model result can be improved in case of a failure, so just link to the model assessment until a failure actually happens.
 
 		if err := ctx.Repository.Reset(ctx.Logger); err != nil {
 			ctx.Logger.Panicf("ERROR: unable to reset temporary repository path: %s", err)
@@ -89,7 +89,7 @@ func (t *TaskWriteTests) Run(ctx evaltask.Context) (repositoryAssessment map[eva
 			// If there is an execution timeout do not run "symflower fix" because the code itself is correct.
 			if errors.Is(err, context.DeadlineExceeded) {
 				modelAssessment.Add(modelAssessmentForFile)
-				withSymflowerAssessment.Add(withSymflowerAssessmentForFile)
+				withSymflowerFixAssessment.Add(withSymflowerFixAssessmentForFile)
 
 				continue
 			}
@@ -102,7 +102,7 @@ func (t *TaskWriteTests) Run(ctx evaltask.Context) (repositoryAssessment map[eva
 					problems = append(problems, err)
 
 					modelAssessment.Add(modelAssessmentForFile)
-					withSymflowerAssessment.Add(withSymflowerAssessmentForFile)
+					withSymflowerFixAssessment.Add(withSymflowerFixAssessmentForFile)
 
 					continue
 				} else {
@@ -114,7 +114,7 @@ func (t *TaskWriteTests) Run(ctx evaltask.Context) (repositoryAssessment map[eva
 					withSymflowerFixAssessments.Award(metrics.AssessmentKeyFilesExecuted)
 					withSymflowerFixAssessments.AwardPoints(metrics.AssessmentKeyCoverage, withSymflowerFixTestResult.Coverage)
 
-					withSymflowerAssessmentForFile = metrics.CombineWithSymflowerFixAssessments(modelAssessmentForFile, withSymflowerFixAssessments)
+					withSymflowerFixAssessmentForFile = metrics.CombineWithSymflowerFixAssessments(modelAssessmentForFile, withSymflowerFixAssessments)
 				}
 			}
 		} else {
@@ -124,12 +124,12 @@ func (t *TaskWriteTests) Run(ctx evaltask.Context) (repositoryAssessment map[eva
 		}
 
 		modelAssessment.Add(modelAssessmentForFile)
-		withSymflowerAssessment.Add(withSymflowerAssessmentForFile)
+		withSymflowerFixAssessment.Add(withSymflowerFixAssessmentForFile)
 	}
 
 	repositoryAssessment = map[evaltask.Identifier]metrics.Assessments{
 		IdentifierWriteTests:             modelAssessment,
-		IdentifierWriteTestsSymflowerFix: withSymflowerAssessment,
+		IdentifierWriteTestsSymflowerFix: withSymflowerFixAssessment,
 	}
 
 	return repositoryAssessment, problems, nil