Integrate Changes

JuliaQUBO · Nov 26, 2023 · f4b072a · f4b072a
1 parent 6896b56
commit f4b072a
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 25 deletions.
diff --git a/src/compiler/constraints.jl b/src/compiler/constraints.jl
@@ -529,7 +529,6 @@ function constraint(
 
     return g^2 + h
 end
-<<<<<<< HEAD
 
 function constraint(
     model::Virtual.Model{T},
@@ -619,5 +618,3 @@ function encoding_constraints!(model::Virtual.Model{T}, ::AbstractArchitecture)
 
     return nothing
 end
-=======
->>>>>>> origin/master
diff --git a/src/compiler/error.jl b/src/compiler/error.jl
@@ -21,8 +21,6 @@ end
 
 function compilation_error(msg::Union{Nothing,String} = nothing)
     throw(CompilationError(msg))
-<<<<<<< HEAD
-=======
 
     return nothing
 end
@@ -36,5 +34,4 @@ function compilation_error!(model::Virtual.Model, msg::Union{Nothing,String} = n
     compilation_error(msg)
 
     return nothing
->>>>>>> origin/master
 end
diff --git a/src/compiler/variables.jl b/src/compiler/variables.jl
@@ -98,17 +98,9 @@ function variable_𝔹!(model::Virtual.Model{T}, i::Union{VI,CI}) where {T}
     return Encoding.encode!(model, i, Encoding.Mirror{T}())
 end
 
-<<<<<<< HEAD
 function variable_ℤ!(model::Virtual.Model{T}, x::VI, (a, b)::Tuple{A,B}) where {T,A<:Union{T,Nothing},B<:Union{T,Nothing}}
     if !isnothing(a) && !isnothing(b)
         let e = Attributes.variable_encoding_method(model, x)
-=======
-function variable_ℤ!(model::Virtual.Model{T}, vi::VI, (a, b)::Tuple{T,T}) where {T}
-    if isnothing(a) || isnothing(b)
-        error("Unbounded variable $(vi) ∈ ℤ")
-    else
-        let e = Attributes.variable_encoding_method(model, vi)
->>>>>>> origin/master
             S = (a, b)
 
             return Encoding.encode!(model, vi, e, S)
@@ -134,15 +126,8 @@ function variable_ℤ!(model::Virtual.Model{T}, ci::CI, (a, b)::Tuple{T,T}) wher
     end
 end
 
-<<<<<<< HEAD
 function variable_ℝ!(model::Virtual.Model{T}, x::VI, (a, b)::Tuple{A,B}) where {T,A<:Union{T,Nothing},B<:Union{T,Nothing}}
     if !isnothing(a) && !isnothing(b)
-=======
-function variable_ℝ!(model::Virtual.Model{T}, vi::VI, (a, b)::Tuple{T,T}) where {T}
-    if isnothing(a) || isnothing(b)
-        error("Unbounded variable $(vi) ∈ ℝ")
-    else
->>>>>>> origin/master
         # TODO: Solve this bit-guessing magic??? (DONE)
         # IDEA: 
         #     Let x̂ ~ U[a, b], K = 2ᴺ, γ = [a, b]

diff --git a/src/encoding/variables/interval/binary.jl b/src/encoding/variables/interval/binary.jl
@@ -38,14 +38,10 @@ function encode(var::Function, e::Binary{T}, S::Tuple{T,T}; tol::Union{T,Nothing
     a, b = integer_interval(S)
 
     if a == b
-<<<<<<< HEAD
-        return (VI[], PBO.PBF{VI,T}(a), nothing)
-=======
         y = VI[]
         ξ = PBO.PBF{VI,T}(a)
 
         return (y, ξ, nothing)
->>>>>>> origin/master
     end
 
     M = trunc(Int, b - a)