Fix MQLib format + Bump Version

JuliaQUBO · Oct 2, 2024 · 2d38ca7 · 2d38ca7 · pedromxavier · Oct 2, 2024
1 parent d4ea2cd
commit 2d38ca7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "QUBOTools"
 uuid = "60eb5b62-0a39-4ddc-84c5-97d2adff9319"
 authors = ["pedromxavier <mail@pedro.ϵλ>", "pedroripper <[email protected]>", "AndradeTiago <[email protected]>", "joaquimg <[email protected]>", "bernalde <[email protected]>"]
-version = "0.10.0"
+version = "0.10.1"
 
 [deps]
 GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
@@ -26,14 +26,14 @@ MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
 QUBOTools_MOI = ["MathOptInterface"]
 
 [compat]
-GeometryBasics = "0.4"
-Graphs = "1"
-HDF5 = "0.16.15"
-JSON = "0.21.3"
-JSONSchema = "1"
-MathOptInterface = "1"
-NetworkLayout = "0.4.5"
+GeometryBasics            = "0.4"
+Graphs                    = "1"
+HDF5                      = "0.16.15"
+JSON                      = "0.21.3"
+JSONSchema                = "1"
+MathOptInterface          = "1"
+NetworkLayout             = "0.4.5"
 PseudoBooleanOptimization = "0.2"
-RecipesBase = "1"
-Statistics = "1"
-julia = "1.9"
+RecipesBase               = "1"
+Statistics                = "1"
+julia                     = "1.9"
diff --git a/src/library/format/qubo/parser.jl b/src/library/format/qubo/parser.jl
@@ -78,8 +78,9 @@ function _parse_entry!(data::Dict{Symbol,Any}, line::AbstractString, ::QUBO, ::V
         return false
     end
 
-    i = parse(Int, m[1]) + 1
-    j = parse(Int, m[2]) + 1
+    # NOTE: MQLib format is 1-indexed
+    i = parse(Int, m[1])
+    j = parse(Int, m[2])
     c = parse(Float64, m[3])
 
     if i == j

diff --git a/src/library/format/qubo/printer.jl b/src/library/format/qubo/printer.jl
@@ -100,6 +100,7 @@ end
 function _print_entries(io::IO, data::Dict{Symbol,Any}, ::QUBO, ::Val{:dwave})
     println(io, "c linear terms")
 
+    # NOTE: D-Wave format is 0-indexed
     for (i, l) in data[:linear_terms]
         println(io, "$(i-1) $(i-1) $(l)")
     end
@@ -116,16 +117,17 @@ end
 function _print_entries(io::IO, data::Dict{Symbol,Any}, ::QUBO, ::Val{:mqlib})
     println(io, "# linear terms")
 
+    # NOTE: MQLib format is 1-indexed
     for (i, l) in data[:linear_terms]
-        println(io, "$(i-1) $(i-1) $(l)")
+        println(io, "$(i) $(i) $(l)")
     end
 
     println(io, "# quadratic terms")
 
     for ((i, j), q) in data[:quadratic_terms]
         # NOTE: in MQLib qubo files, quadratic coefficients
         # are halved when written to the file
-        println(io, "$(i-1) $(j-1) $(q/2)")
+        println(io, "$(i) $(j) $(q/2)")
     end
 
     return nothing