diff --git a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/GradientDescent.java b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/GradientDescent.java index 2cea4721f..3660b0684 100644 --- a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/GradientDescent.java +++ b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/GradientDescent.java @@ -369,7 +369,7 @@ protected void doLearn() { computeIterationStatistics(); - computeTotalWeightGradient(); + addTotalWeightGradient(); addTotalAtomGradient(); if (clipWeightGradient) { clipWeightGradient(); @@ -985,7 +985,7 @@ protected float computeRegularization() { /** * Compute the gradient of the regularized learning loss with respect to the weights. */ - protected void computeTotalWeightGradient() { + protected void addTotalWeightGradient() { if (!symbolicWeightLearning) { return; } diff --git a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineBinaryCrossEntropy.java b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineBinaryCrossEntropy.java index 893f2788a..4cda90f2a 100644 --- a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineBinaryCrossEntropy.java +++ b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineBinaryCrossEntropy.java @@ -1,7 +1,7 @@ /* * This file is part of the PSL software. * Copyright 2011-2015 University of Maryland - * Copyright 2013-2023 The Regents of the University of California + * Copyright 2013-2024 The Regents of the University of California * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineMinimizer.java b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineMinimizer.java index c6baa19a0..b141cbaab 100644 --- a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineMinimizer.java +++ b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineMinimizer.java @@ -1,7 +1,7 @@ /* * This file is part of the PSL software. * Copyright 2011-2015 University of Maryland - * Copyright 2013-2023 The Regents of the University of California + * Copyright 2013-2024 The Regents of the University of California * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineSquaredError.java b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineSquaredError.java index f5518bcf6..0726a641d 100644 --- a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineSquaredError.java +++ b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineSquaredError.java @@ -1,7 +1,7 @@ /* * This file is part of the PSL software. * Copyright 2011-2015 University of Maryland - * Copyright 2013-2023 The Regents of the University of California + * Copyright 2013-2024 The Regents of the University of California * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradient.java b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradient.java index 4a59e8357..596808605 100644 --- a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradient.java +++ b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradient.java @@ -1,3 +1,20 @@ +/* + * This file is part of the PSL software. + * Copyright 2011-2015 University of Maryland + * Copyright 2013-2024 The Regents of the University of California + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.linqs.psl.application.learning.weight.gradient.policygradient; import org.linqs.psl.application.learning.weight.gradient.GradientDescent; diff --git a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradientEvaluation.java b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradientEvaluation.java index de3fc0cb2..2db1a60f0 100644 --- a/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradientEvaluation.java +++ b/psl-core/src/main/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradientEvaluation.java @@ -1,7 +1,7 @@ /* * This file is part of the PSL software. * Copyright 2011-2015 University of Maryland - * Copyright 2013-2023 The Regents of the University of California + * Copyright 2013-2024 The Regents of the University of California * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineBinaryCrossEntropyTest.java b/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineBinaryCrossEntropyTest.java index ae53cfeca..20518372c 100644 --- a/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineBinaryCrossEntropyTest.java +++ b/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineBinaryCrossEntropyTest.java @@ -1,7 +1,7 @@ /* * This file is part of the PSL software. * Copyright 2011-2015 University of Maryland - * Copyright 2013-2023 The Regents of the University of California + * Copyright 2013-2024 The Regents of the University of California * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineSquaredErrorTest.java b/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineSquaredErrorTest.java index cea2e69c4..493bf63b9 100644 --- a/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineSquaredErrorTest.java +++ b/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/onlineminimizer/OnlineSquaredErrorTest.java @@ -1,7 +1,7 @@ /* * This file is part of the PSL software. * Copyright 2011-2015 University of Maryland - * Copyright 2013-2023 The Regents of the University of California + * Copyright 2013-2024 The Regents of the University of California * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradientEvaluationTest.java b/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradientEvaluationTest.java index f82574e80..e4cdb1247 100644 --- a/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradientEvaluationTest.java +++ b/psl-core/src/test/java/org/linqs/psl/application/learning/weight/gradient/policygradient/PolicyGradientEvaluationTest.java @@ -1,7 +1,7 @@ /* * This file is part of the PSL software. * Copyright 2011-2015 University of Maryland - * Copyright 2013-2023 The Regents of the University of California + * Copyright 2013-2024 The Regents of the University of California * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.