Fix bounded coefficient gaps

JuliaQUBO · Oct 30, 2023 · fc22ab3 · fc22ab3
1 parent 0fced95
commit fc22ab3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/src/encoding/abstract.jl b/src/encoding/abstract.jl
@@ -0,0 +1,3 @@
+function encodes(f::PBO.AbstractPBF{V,T}, S::Tuple{T,T}, tol::T) where {V,T}
+    return encodes(f, S, tol)
+end
diff --git a/src/encoding/encoding.jl b/src/encoding/encoding.jl
@@ -1,7 +1,7 @@
 module Encoding
 
 import MathOptInterface as MOI
-import QUBOTools: PBO
+import PseudoBooleanOptimization as PBO
 
 const VI = MOI.VariableIndex
 

diff --git a/src/encoding/interface.jl b/src/encoding/interface.jl
@@ -15,6 +15,11 @@ function encode end
 """
 function encode! end
 
+@doc raw"""
+    encodes(f::AbstractPBF, S::Tuple{T,T}, tol::T) where {T}
+"""
+function encodes end
+
 @doc raw"""
     encoding_bits(e::VariableEncodingMethod, S::Tuple{T,T}, tol::T) where {T}
 """

diff --git a/src/encoding/variables/interval/bounded.jl b/src/encoding/variables/interval/bounded.jl
@@ -78,7 +78,7 @@ function encode(
     a, b = S
 
     ℓ = abs(b - a)
-    r = ceil(Int, ℓ / e.μ - 1)
+    r = floor(Int, ℓ / e.μ - 1)
     δ = ℓ - r * e.μ
 
     Δ::Tuple{T,T} = (0, δ)
@@ -108,7 +108,7 @@ function encoding_bits(
     a, b = S
 
     ℓ = abs(b - a)
-    r = ceil(Int, ℓ / e.μ - 1)
+    r = floor(Int, ℓ / e.μ - 1)
     δ = ℓ - r * e.μ
 
     Δ::Tuple{T,T} = (0, δ)

diff --git a/test/unit/encoding/variables.jl b/test/unit/encoding/variables.jl
@@ -226,23 +226,23 @@ function test_variable_encoding_methods()
                         let μ = 1.0
                             ê = ToQUBO.Encoding.Bounded(e, μ)
                             φ = PBO.vargen(VI)
-                            S = (-2.0, 2.0)
+                            S = (-1.0, 2.5)
                             n = 8
 
                             y, ξ, χ = ToQUBO.Encoding.encode(φ, ê, S, n)
 
                             @test length(y) == n
                             @test y == VI.(1:n)
                             @test ξ == PBO.PBF{VI,Float64}(
-                                y[1] => 1 / 31,
-                                y[2] => 2 / 31,
-                                y[3] => 4 / 31,
-                                y[4] => 8 / 31,
-                                y[5] => 16 / 31,
-                                y[6] => 1.0,
+                                y[1] => 1.5 / 63,
+                                y[2] => 3 / 63,
+                                y[3] => 6 / 63,
+                                y[4] => 12 / 63,
+                                y[5] => 24 / 63,
+                                y[6] => 48 / 63,
                                 y[7] => 1.0,
                                 y[8] => 1.0,
-                                -2.0,
+                                -1.0,
                             )
                             @test isnothing(χ)
                         end