Add regularization to prox value.

linqs · Sep 8, 2023 · ad1c05c · ad1c05c
1 parent 5c49c87
commit ad1c05c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 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
@@ -357,10 +357,10 @@ protected void doLearn() {
                     clipWeightGradient();
                 }
 
-                gradientStep(epoch);
-
                 float batchObjective = computeTotalLoss();
 
+                gradientStep(epoch);
+
                 long batchEnd = System.currentTimeMillis();
 
                 log.trace("Batch: {} -- Weight Learning Objective: {}, Gradient Magnitude: {}, Iteration Time: {}",

diff --git a/...src/main/java/org/linqs/psl/application/learning/weight/gradient/minimizer/Minimizer.java b/...src/main/java/org/linqs/psl/application/learning/weight/gradient/minimizer/Minimizer.java
@@ -696,12 +696,17 @@ private float computeEnergyDifference(float[] incompatibilityDifference){
     }
 
     private float computeTotalProxValue(float[] proxRuleIncompatibility) {
+        float regularizationParameter = 0.0f;
+        if (trainInferenceApplication.getReasoner() instanceof DualBCDReasoner) {
+            regularizationParameter = (float)((DualBCDReasoner)trainInferenceApplication.getReasoner()).regularizationParameter;
+        }
+
         float totalProxValue = 0.0f;
         for (int i = 0; i < proxRules.length; i++) {
             proxRuleIncompatibility[i] = proxRuleObservedAtoms[i].getValue() - augmentedInferenceAtomValueState[proxRuleIndexToRVAtomIndex.get(i)];
             totalProxValue += Math.pow(proxRuleIncompatibility[i], 2.0f);
         }
-        totalProxValue = proxRuleWeight * totalProxValue;
+        totalProxValue = (proxRuleWeight + regularizationParameter) * totalProxValue;
 
         return totalProxValue;
     }