Skip to content

Commit

Permalink
[codac2_renamed] Python package renamed into "codac2"
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonRohou committed Jan 20, 2025
1 parent 90d48ff commit 8527329
Show file tree
Hide file tree
Showing 22 changed files with 36 additions and 15 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/dockercentos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ on:
- codac1
- codac2
- codac2_codac4matlab
branches-ignore:
- codac2_renamed
tags: '' # Restrict to blank tags
pull_request:
branches-ignore:
- codac2_renamed

jobs:
dockercentos:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/dockermatrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ on:
#branches-ignore:
#- codac2_codac4matlab
tags: '' # Restrict to blank tags
branches-ignore:
- codac2_renamed
pull_request:
branches-ignore:
- codac2_codac4matlab
- codac2_renamed

jobs:
dockermatrix:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/macosmatrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ on:
- codac1
- codac2
- codac2_codac4matlab
branches-ignore:
- codac2_renamed
tags: '' # Restrict to blank tags
pull_request:
branches-ignore:
- codac2_renamed

jobs:
macosmatrix:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ on:
push:
branches-ignore:
- codac2_codac4matlab
- codac2_renamed
tags: '' # Restrict to blank tags
pull_request:
branches-ignore:
- codac2_codac4matlab
- codac2_renamed

jobs:
tests:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/unixmatrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
on:
push:
branches: '**'
branches-ignore:
- codac2_renamed
tags: '' # Restrict to blank tags
pull_request:
branches-ignore:
- codac2_renamed

jobs:
deploy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/vcmatrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ on:
- codac1
- codac2
- codac2_codac4matlab
branches-ignore:
- codac2_renamed
tags: '' # Restrict to blank tags
pull_request:
branches-ignore:
- codac2_renamed

jobs:
vcmatrix:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#set(CMAKE_C_COMPILER "gcc-7")
#set(CMAKE_CXX_COMPILER "/usr/bin/g++-7")

project(codac VERSION ${VERSION} LANGUAGES CXX)
project(codac2 VERSION ${VERSION} LANGUAGES CXX)

if(NOT VERSION_ID)
set(PROJECT_VERSION_FULL ${PROJECT_VERSION})
Expand Down
2 changes: 1 addition & 1 deletion examples/00_graphics/graphic_examples.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from codac import *
from codac2 import *

# Graphics can be directly called without a Figure2D instanciation, using "DefaultView":

Expand Down
2 changes: 1 addition & 1 deletion examples/02_centered_form/main.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Example from the publication:
# https://www.ensta-bretagne.fr/jaulin/paper_centeredActa.pdf

from codac import *
from codac2 import *

x = VectorVar(3)
f = AnalyticFunction([x], [
Expand Down
2 changes: 1 addition & 1 deletion examples/03_sivia/main.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from codac import *
from codac2 import *

x = VectorVar(2)
f = AnalyticFunction([x], sqr(x[0])*sin(sqr(x[0])+sqr(x[1]))-sqr(x[1]))
Expand Down
2 changes: 1 addition & 1 deletion examples/04_explored_area/main.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from codac import *
from codac2 import *

# Example: A sampled trajectory, 'sampled_f' (composed of time-stamped positions with
# linear interpolation between them), is first obtained by discretizing an analytical
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_sep/coloration.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from codac import *
from codac2 import *
import math


Expand Down
2 changes: 1 addition & 1 deletion examples/custom_sep/custom_ctc.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from codac import *
from codac2 import *

# As an example, defining a custom contractor (does nothing special here)

Expand Down
2 changes: 1 addition & 1 deletion examples/custom_sep/custom_sep.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from codac import *
from codac2 import *

# As an example, defining a custom separator as the complementary of another one

Expand Down
4 changes: 0 additions & 4 deletions python/codac/__init__.py

This file was deleted.

1 change: 0 additions & 1 deletion python/codac/graphics/__init__.py

This file was deleted.

1 change: 0 additions & 1 deletion python/codac/unsupported/__init__.py

This file was deleted.

4 changes: 4 additions & 0 deletions python/codac2/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from codac2.core import *
from codac2.graphics import *
from codac2.unsupported import *
from .version import __version__
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from codac._core import *
from codac2._core import *
import sys

def codac_error(message):
Expand Down
1 change: 1 addition & 0 deletions python/codac2/graphics/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from codac2._graphics import *
File renamed without changes.
1 change: 1 addition & 0 deletions python/codac2/unsupported/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from codac2._unsupported import *

0 comments on commit 8527329

Please sign in to comment.