Merge pull request #14 from detrin/devel

Devel
detrin · Apr 29, 2021 · 0bbddca · 0bbddca
2 parents a226010 + c2256a9
commit 0bbddca
Show file tree

Hide file tree

Showing 13 changed files with 799 additions and 565 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,9 +10,9 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.3'
           - '1.4'
           - '1.5'
+          - '1.6'
         os:
           - ubuntu-latest
           - macOS-latest

diff --git a/.github/workflows/deploy-nightly.yml b/.github/workflows/deploy-nightly.yml
@@ -14,6 +14,7 @@ jobs:
           - '1.3'
           - '1.4'
           - '1.5'
+          - '1.6'
           - 'nightly'
         os:
           - ubuntu-latest

diff --git a/README.md b/README.md
@@ -1,12 +1,7 @@
 # OpenQuantumSystems.jl
 
-| Service       | Master                                                                                                                                                                           | Develop                                                                                                                                                                            |
-| :------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Stable        | [![Actions Status](https://github.com/detrin/OpenQuantumSystems.jl/workflows/CI/badge.svg?branch=master)](https://github.com/detrin/OpenQuantumSystems.jl/actions)               | [![Actions Status](https://github.com/detrin/OpenQuantumSystems.jl/workflows/CI/badge.svg?branch=devel)](https://github.com/detrin/OpenQuantumSystems.jl/actions)                  |
-| Nightly Julia | [![Actions Status](https://github.com/detrin/OpenQuantumSystems.jl/workflows/CI-nightly-julia/badge.svg?branch=master)](https://github.com/detrin/OpenQuantumSystems.jl/actions) | [![Actions Status](https://github.com/detrin/OpenQuantumSystems.jl/workflows/CI-nightly-julia/badge.svg?branch=devel)](https://github.com/detrin/OpenQuantumSystems.jl/actions)    |
-| Nigtly deploy | [![Actions Status](https://github.com/detrin/OpenQuantumSystems.jl/workflows/Deploy%20Nightly/badge.svg?branch=master)](https://github.com/detrin/OpenQuantumSystems.jl/actions) | [![Actions Status](https://github.com/detrin/OpenQuantumSystems.jl/workflows/Deploy%20Nightly/badge.svg?branch=devel)](https://github.com/detrin/OpenQuantumSystems.jl/actions)    |
-| coveralls     | [![Coverage Status](https://coveralls.io/repos/detrin/OpenQuantumSystems.jl/badge.svg?branch=master)](https://coveralls.io/r/detrin/OpenQuantumSystems.jl?branch=master)         | [![Coverage Status](https://coveralls.io/repos/github/detrin/OpenQuantumSystems.jl/badge.svg?branch=devel)](https://coveralls.io/github/detrin/OpenQuantumSystems.jl?branch=devel) |
-| codecov       | [![codecov](https://codecov.io/gh/detrin/OpenQuantumSystems.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/detrin/OpenQuantumSystems.jl)                               | [![codecov](https://codecov.io/gh/detrin/OpenQuantumSystems.jl/branch/devel/graph/badge.svg)](https://codecov.io/gh/detrin/OpenQuantumSystems.jl)                                  |
+[![Actions Status](https://github.com/detrin/OpenQuantumSystems.jl/workflows/CI/badge.svg?branch=master)](https://github.com/detrin/OpenQuantumSystems.jl/actions)
+[![codecov](https://codecov.io/gh/detrin/OpenQuantumSystems.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/detrin/OpenQuantumSystems.jl)
 
 **OpenQuantumSystems.jl** is a numerical framework written in [Julia] that makes
 it easy to simulate various kinds of quantum systems. It is inspired by the
@@ -40,3 +35,16 @@ or create a pull request.
 4. - GPU support for Schrodinger equation and possibly state decomposition.
    - Anharmonic oscillators.
    - Double excited states.
+
+### Branches status
+
+Master
+
+[![Actions Status](https://github.com/detrin/OpenQuantumSystems.jl/workflows/CI-nightly-julia/badge.svg?branch=master)](https://github.com/detrin/OpenQuantumSystems.jl/actions)
+[![Actions Status](https://github.com/detrin/OpenQuantumSystems.jl/workflows/Deploy%20Nightly/badge.svg?branch=master)](https://github.com/detrin/OpenQuantumSystems.jl/actions)
+
+Develop
+
+[![Actions Status](https://github.com/detrin/OpenQuantumSystems.jl/workflows/CI/badge.svg?branch=devel)](https://github.com/detrin/OpenQuantumSystems.jl/actions)
+[![Actions Status](https://github.com/detrin/OpenQuantumSystems.jl/workflows/CI-nightly-julia/badge.svg?branch=devel)](https://github.com/detrin/OpenQuantumSystems.jl/actions)
+[![codecov](https://codecov.io/gh/detrin/OpenQuantumSystems.jl/branch/devel/graph/badge.svg)](https://codecov.io/gh/detrin/OpenQuantumSystems.jl)
diff --git a/src/OpenQuantumSystems.jl b/src/OpenQuantumSystems.jl
@@ -102,6 +102,7 @@ export bases,
     avg_gate_fidelity
 
 
+include("core.jl")
 include("sortedindices.jl")
 include("bases.jl")
 include("states.jl")

diff --git a/src/core.jl b/src/core.jl
@@ -0,0 +1,2 @@
+
+const ComputableType = Union{AbstractFloat, Complex}
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ jobs: @@
               - '1.3'
               - '1.4'
               - '1.5'
+              - '1.6'
               - 'nightly'
             os:
               - ubuntu-latest
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@

		const ComputableType = Union{AbstractFloat, Complex}