Skip to content

Commit 2d2e413

Browse files
Jammy2211Jammy2211
authored andcommitted
subtract LH penalty
1 parent 7b51f6f commit 2d2e413

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

autolens/analysis/positions.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,12 @@ def log_likelihood_penalty_from(
191191

192192
penalty = self.log_likelihood_penalty_factor * (max_separation - self.threshold)
193193

194+
print(max_separation, self.threshold, jax.lax.cond(
195+
max_separation > self.threshold,
196+
lambda: penalty,
197+
lambda: jnp.array(0.0),
198+
))
199+
194200
return jax.lax.cond(
195201
max_separation > self.threshold,
196202
lambda: penalty,

autolens/imaging/model/analysis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def log_likelihood_function(self, instance: af.ModelInstance) -> float:
8989
instance=instance
9090
)
9191

92-
return self.fit_from(instance=instance).figure_of_merit + log_likelihood_penalty
92+
return self.fit_from(instance=instance).figure_of_merit - log_likelihood_penalty
9393

9494
def fit_from(
9595
self,

autolens/interferometer/model/analysis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def log_likelihood_function(self, instance):
153153

154154
log_likelihood_penalty = self.log_likelihood_penalty_from(instance=instance)
155155

156-
return self.fit_from(instance=instance).figure_of_merit + log_likelihood_penalty
156+
return self.fit_from(instance=instance).figure_of_merit - log_likelihood_penalty
157157

158158
def fit_from(
159159
self,

0 commit comments

Comments
 (0)