Merge pull request #3 from psrenergy/pr/update

Update dependencies

Author: pedroripper

CondaPkg.toml

@@ -1,7 +1,7 @@
 channels = ["anaconda", "conda-forge"]
 
 [deps]
-python = ">=3.8,<3.11"
+python = ">=3.8,<=3.11"
 
 [pip.deps]
 numpy = ">=1.20.0"

Project.toml

@@ -1,18 +1,16 @@
-name    = "PySA"
-uuid    = "46b73cfa-376a-48ee-8926-0c45ac3f7830"
+name = "PySA"
+uuid = "46b73cfa-376a-48ee-8926-0c45ac3f7830"
 authors = ["pedromxavier <pedromxavier@psr-inc.com>"]
 version = "0.2.0"
 
 [deps]
-LinearAlgebra    = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
-PythonCall       = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
-QUBODrivers      = "a3f166f7-2cd3-47b6-9e1e-6fbfe0449eb0"
-QUBOTools        = "60eb5b62-0a39-4ddc-84c5-97d2adff9319"
+PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
+QUBO = "ce8c2e91-a970-4681-856b-16178c24a30c"
 
 [compat]
 MathOptInterface = "1"
-PythonCall       = "0.9.15"
-QUBODrivers      = "0.3"
-QUBOTools        = "0.9"
-julia            = "1.9"
+PythonCall = "0.9.20"
+julia = "1.9"
+QUBO = "0.3.0"

src/PySA.jl

@@ -3,8 +3,9 @@ module PySA
 using PythonCall
 using LinearAlgebra
 
-import QUBODrivers
-import QUBOTools
+import QUBO
+QUBODrivers = QUBO.QUBODrivers
+QUBOTools = QUBO.QUBOTools
 import MathOptInterface as MOI
 
 const np      = PythonCall.pynew()
@@ -82,7 +83,7 @@ function QUBODrivers.sample(sampler::Optimizer{T}) where {T}
         for i = 1:num_replicas
             # NOTE: Python is 0-indexed
             # NOTE: sign has to be inverted, as mentioned before
-            ψ = -round.(Int, pyconvert.(T, Ψ[i-1]))
+            ψ = -round.(Int, pyconvert.(T, [var for var in Ψ[i-1]]))
 
             # Compute value instead of retrieving it, to avoid precision errors
             λ = QUBOTools.value(ψ, h, J, α, β) 

test/runtests.jl

@@ -1,4 +1,4 @@
-using PySA: PySA, MOI, QUBODrivers
+using PySA: PySA, MOI, QUBO.QUBODrivers
 
 QUBODrivers.test(PySA.Optimizer; examples=true) do model
     MOI.set(model, MOI.Silent(), true)