Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into px/checkpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
pedromxavier committed Sep 19, 2024
2 parents 71df92b + fbddd39 commit 98c928e
Show file tree
Hide file tree
Showing 6 changed files with 115 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "QUBO"
uuid = "ce8c2e91-a970-4681-856b-16178c24a30c"
authors = ["pedromxavier <pedroxavier@psr-inc.com>", "pedroripper <pedroripper@psr-inc.com>", "joaquimg <joaquim@psr-inc.com>", "AndradeTiago <tiago.andrade@psr-inc.com>", "bernalde <dbernaln@purdue.edu>"]
version = "0.3.0"
version = "0.3.2-dev"

[deps]
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
Expand All @@ -15,5 +15,5 @@ JuMP = "1"
MathOptInterface = "1"
QUBODrivers = "0.3"
QUBOTools = "0.9"
ToQUBO = "0.1.7"
ToQUBO = "0.1.8"
julia = "1.9"
Binary file added docs/src/assets/logo-collaboration-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions docs/src/assets/logo-collaboration-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/src/assets/logo-collaboration-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions docs/src/assets/logo-collaboration-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 9 additions & 8 deletions docs/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

## Introduction

`QUBO.jl` is an all-in-one package for working with QUBO formulations in [JuMP](https://github.com/jump-dev/JuMP.jl) and interfacing with QUBO solvers. This project aggregates three complementary packages: [`ToQUBO.jl`](https://github.com/psrenergy/ToQUBO.jl), [`QUBODrivers.jl`](https://github.com/psrenergy/QUBODrivers.jl) and [`QUBOTools.jl`](https://github.com/psrenergy/QUBOTools.jl).
`QUBO.jl` is an all-in-one package for working with QUBO formulations in [JuMP](https://github.com/jump-dev/JuMP.jl) and interfacing with QUBO solvers. This project aggregates three complementary packages: [`ToQUBO.jl`](https://github.com/JuliaQUBO/ToQUBO.jl), [`QUBODrivers.jl`](https://github.com/JuliaQUBO/QUBODrivers.jl) and [`QUBOTools.jl`](https://github.com/JuliaQUBO/QUBOTools.jl).

## QUBO?

Expand Down Expand Up @@ -42,7 +42,7 @@ More features are available in the documentation.

### Instalation
```julia
julia> ]add https://github.com/psrenergy/QUBO.jl#master
julia> ]add https://github.com/JuliaQUBO/QUBO.jl#master
```
### Example

Expand Down Expand Up @@ -70,14 +70,15 @@ end
```@raw html
<div align="center">
<h2>QUBO.jl Packages</h2>
<a href="https://github.com/psrenergy/ToQUBO.jl">
<img width="200px" src="https://raw.githubusercontent.com/psrenergy/ToQUBO.jl/master/docs/src/assets/logo.svg" alt="ToQUBO.jl" />
<a href="https://github.com/JuliaQUBO/ToQUBO.jl">
<img width="200px" src="./logo.svg" alt="ToQUBO.jl" />
</a>
<a href="https://github.com/psrenergy/QUBODrivers.jl">
<img width="200px" src="https://raw.githubusercontent.com/psrenergy/QUBODrivers.jl/master/docs/src/assets/logo.svg" alt="QUBODrivers.jl" />
<a href="https://github.com/JuliaQUBO/QUBODrivers.jl">
<img width="200px" src="./logo.svg" alt="QUBODrivers.jl" />
</a>
<a href="https://github.com/psrenergy/QUBOTools.jl">
<img width="200px" src="https://raw.githubusercontent.com/psrenergy/QUBOTools.jl/main/docs/src/assets/logo.svg" alt="QUBOTools.jl" />
<a href="https://github.com/JuliaQUBO/QUBOTools.jl">
<img width="200px" src="./logo.svg" alt="QUBOTools.jl" />
</a>
</div>
```

0 comments on commit 98c928e

Please sign in to comment.