Merge branch 'main' into experimental_minimizer_based_learning

linqs · Aug 18, 2023 · 9d1fa28 · 9d1fa28
2 parents 0e26b89 + d58ca99
commit 9d1fa28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ore/src/main/java/org/linqs/psl/application/learning/weight/gradient/GradientDescent.java b/...ore/src/main/java/org/linqs/psl/application/learning/weight/gradient/GradientDescent.java
@@ -302,7 +302,7 @@ protected void doLearn() {
 
     protected void runMAPEvaluation() {
         // Compute the MAP state before evaluating so variables have assigned values.
-        log.trace("Running Inference.");
+        log.trace("Running MAP Inference.");
         computeMAPStateWithWarmStart(trainInferenceApplication, trainMAPTermState, trainMAPAtomValueState);
 
         evaluation.compute(trainingMap);

diff --git a/...in/java/org/linqs/psl/application/learning/weight/gradient/optimalvalue/OptimalValue.java b/...in/java/org/linqs/psl/application/learning/weight/gradient/optimalvalue/OptimalValue.java
@@ -20,7 +20,6 @@
 import org.linqs.psl.application.learning.weight.gradient.GradientDescent;
 import org.linqs.psl.database.AtomStore;
 import org.linqs.psl.database.Database;
-import org.linqs.psl.model.atom.GroundAtom;
 import org.linqs.psl.model.atom.ObservedAtom;
 import org.linqs.psl.model.atom.RandomVariableAtom;
 import org.linqs.psl.model.rule.Rule;
@@ -79,6 +78,7 @@ protected void postInitGroundModel() {
     protected void computeLatentInferenceIncompatibility() {
         fixLabeledRandomVariables();
 
+        log.trace("Running Latent Inference.");
         computeMAPStateWithWarmStart(trainInferenceApplication, latentInferenceTermState, latentInferenceAtomValueState);
         inTrainingMAPState = true;