Fix deserialize logic in loss_multibinary_log (#2547)

3b518f40 · Adrià Arrufat · GitHub · 1b7053fe · 3b518f40
Unverified Commit 3b518f40 authored Mar 23, 2022 by Adrià Arrufat Committed by GitHub Mar 23, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 3 deletions

dlib/dnn/loss.h dlib/dnn/loss.h +12 -3

No files found.
--- a/dlib/dnn/loss.h
+++ b/dlib/dnn/loss.h
@@ -877,10 +877,19 @@ namespace dlib
        {
            std::string version;
            deserialize(version, in);
-            if (version != "loss_multibinary_log_" || version != "loss_multibinary_log_2")
-                throw serialization_error("Unexpected version found while deserializing dlib::loss_multibinary_log_.");
-            if (version == "loss_multibinary_log_2")
+            if (version == "loss_multibinary_log_")
+            {
+                item.gamma = 0;
+                return;
+            }
+            else if (version == "loss_multibinary_log_2")
+            {
                deserialize(item.gamma, in);
+            }
+            else
+            {
+                throw serialization_error("Unexpected version found while deserializing dlib::loss_multibinary_log_.");
+            }
        }

        friend std::ostream& operator<<(std::ostream& out, const loss_multibinary_log_& item)