Merge pull request #1146 from rhayes777/feature/fix_nautilus_fitness

Jammy2211 · web-flow · commit 5f932511ce75 · 2025-06-12T08:48:41.000+01:00
feature/nautilus_fitness
diff --git a/autofit/non_linear/search/abstract_search.py b/autofit/non_linear/search/abstract_search.py
@@ -683,6 +683,7 @@ def start_resume_fit(self, analysis: Analysis, model: AbstractPriorModel) -> Res
             model=model,
             analysis=analysis,
         )
+
         samples = self.perform_update(
             model=model,
             analysis=analysis,
diff --git a/autofit/non_linear/search/nest/nautilus/search.py b/autofit/non_linear/search/nest/nautilus/search.py
@@ -338,7 +338,7 @@ def call_search(self, search_internal, model, analysis, fitness):
                     search_internal=search_internal
                 )
 
-        return search_internal, fitness
+        return search_internal
 
     def fit_mpi(self, fitness, model, analysis, checkpoint_exists: bool):
         """
@@ -396,7 +396,7 @@ def fit_mpi(self, fitness, model, analysis, checkpoint_exists: bool):
                 **self.config_dict_run,
             )
 
-        return search_internal, fitness
+        return search_internal
 
     def iterations_from(
         self, search_internal

Original file line number	Diff line number	Diff line change
`@@ -683,6 +683,7 @@ def start_resume_fit(self, analysis: Analysis, model: AbstractPriorModel) -> Res`
`683`	`683`	`model=model,`
`684`	`684`	`analysis=analysis,`
`685`	`685`	`)`
	`686`	`+`
`686`	`687`	`samples = self.perform_update(`
`687`	`688`	`model=model,`
`688`	`689`	`analysis=analysis,`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ def call_search(self, search_internal, model, analysis, fitness):`
`338`	`338`	`search_internal=search_internal`
`339`	`339`	`)`
`340`	`340`
`341`		`- return search_internal, fitness`
	`341`	`+ return search_internal`
`342`	`342`
`343`	`343`	`def fit_mpi(self, fitness, model, analysis, checkpoint_exists: bool):`
`344`	`344`	`"""`
`@@ -396,7 +396,7 @@ def fit_mpi(self, fitness, model, analysis, checkpoint_exists: bool):`
`396`	`396`	`**self.config_dict_run,`
`397`	`397`	`)`
`398`	`398`
`399`		`- return search_internal, fitness`
	`399`	`+ return search_internal`
`400`	`400`
`401`	`401`	`def iterations_from(`
`402`	`402`	`self, search_internal`