diff --git a/.github/workflows/dockercentos.yml b/.github/workflows/dockercentos.yml index 770f2b30..56cf5ea7 100644 --- a/.github/workflows/dockercentos.yml +++ b/.github/workflows/dockercentos.yml @@ -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: diff --git a/.github/workflows/dockermatrix.yml b/.github/workflows/dockermatrix.yml index c91d623e..0275054f 100644 --- a/.github/workflows/dockermatrix.yml +++ b/.github/workflows/dockermatrix.yml @@ -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: diff --git a/.github/workflows/macosmatrix.yml b/.github/workflows/macosmatrix.yml index 057d5408..e33c99d4 100644 --- a/.github/workflows/macosmatrix.yml +++ b/.github/workflows/macosmatrix.yml @@ -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: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0efbe9c8..5cb931d9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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: diff --git a/.github/workflows/unixmatrix.yml b/.github/workflows/unixmatrix.yml index de736fb0..f05628f6 100644 --- a/.github/workflows/unixmatrix.yml +++ b/.github/workflows/unixmatrix.yml @@ -2,8 +2,12 @@ on: push: branches: '**' + branches-ignore: + - codac2_renamed tags: '' # Restrict to blank tags pull_request: + branches-ignore: + - codac2_renamed jobs: deploy: diff --git a/.github/workflows/vcmatrix.yml b/.github/workflows/vcmatrix.yml index ffdfb2ec..0ba96eab 100644 --- a/.github/workflows/vcmatrix.yml +++ b/.github/workflows/vcmatrix.yml @@ -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: diff --git a/CMakeLists.txt b/CMakeLists.txt index 67a35973..344aaa1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) diff --git a/examples/00_graphics/graphic_examples.py b/examples/00_graphics/graphic_examples.py index f6c8770e..fc307bc5 100644 --- a/examples/00_graphics/graphic_examples.py +++ b/examples/00_graphics/graphic_examples.py @@ -1,4 +1,4 @@ -from codac import * +from codac2 import * # Graphics can be directly called without a Figure2D instanciation, using "DefaultView": diff --git a/examples/02_centered_form/main.py b/examples/02_centered_form/main.py index 41ff95f4..fff8e006 100644 --- a/examples/02_centered_form/main.py +++ b/examples/02_centered_form/main.py @@ -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], [ diff --git a/examples/03_sivia/main.py b/examples/03_sivia/main.py index 4b1c1a1f..803e7d01 100644 --- a/examples/03_sivia/main.py +++ b/examples/03_sivia/main.py @@ -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])) diff --git a/examples/04_explored_area/main.py b/examples/04_explored_area/main.py index 7f0c1366..af58e294 100644 --- a/examples/04_explored_area/main.py +++ b/examples/04_explored_area/main.py @@ -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 diff --git a/examples/custom_sep/coloration.py b/examples/custom_sep/coloration.py index 4f71271f..c3ae4cd2 100644 --- a/examples/custom_sep/coloration.py +++ b/examples/custom_sep/coloration.py @@ -1,4 +1,4 @@ -from codac import * +from codac2 import * import math diff --git a/examples/custom_sep/custom_ctc.py b/examples/custom_sep/custom_ctc.py index 2147597f..897a8f80 100644 --- a/examples/custom_sep/custom_ctc.py +++ b/examples/custom_sep/custom_ctc.py @@ -1,4 +1,4 @@ -from codac import * +from codac2 import * # As an example, defining a custom contractor (does nothing special here) diff --git a/examples/custom_sep/custom_sep.py b/examples/custom_sep/custom_sep.py index 72315396..99b77a45 100644 --- a/examples/custom_sep/custom_sep.py +++ b/examples/custom_sep/custom_sep.py @@ -1,4 +1,4 @@ -from codac import * +from codac2 import * # As an example, defining a custom separator as the complementary of another one diff --git a/python/codac/__init__.py b/python/codac/__init__.py deleted file mode 100644 index 853f37ac..00000000 --- a/python/codac/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from codac.core import * -from codac.graphics import * -from codac.unsupported import * -from .version import __version__ \ No newline at end of file diff --git a/python/codac/graphics/__init__.py b/python/codac/graphics/__init__.py deleted file mode 100644 index b5999a4b..00000000 --- a/python/codac/graphics/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from codac._graphics import * \ No newline at end of file diff --git a/python/codac/unsupported/__init__.py b/python/codac/unsupported/__init__.py deleted file mode 100644 index b8c0cacc..00000000 --- a/python/codac/unsupported/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from codac._unsupported import * \ No newline at end of file diff --git a/python/codac2/__init__.py b/python/codac2/__init__.py new file mode 100644 index 00000000..6dd8f107 --- /dev/null +++ b/python/codac2/__init__.py @@ -0,0 +1,4 @@ +from codac2.core import * +from codac2.graphics import * +from codac2.unsupported import * +from .version import __version__ \ No newline at end of file diff --git a/python/codac/core/__init__.py b/python/codac2/core/__init__.py similarity index 99% rename from python/codac/core/__init__.py rename to python/codac2/core/__init__.py index 2807fbeb..9c2d39ea 100644 --- a/python/codac/core/__init__.py +++ b/python/codac2/core/__init__.py @@ -1,4 +1,4 @@ -from codac._core import * +from codac2._core import * import sys def codac_error(message): diff --git a/python/codac2/graphics/__init__.py b/python/codac2/graphics/__init__.py new file mode 100644 index 00000000..d853417c --- /dev/null +++ b/python/codac2/graphics/__init__.py @@ -0,0 +1 @@ +from codac2._graphics import * \ No newline at end of file diff --git a/python/codac/tests/__init__.py b/python/codac2/tests/__init__.py similarity index 100% rename from python/codac/tests/__init__.py rename to python/codac2/tests/__init__.py diff --git a/python/codac2/unsupported/__init__.py b/python/codac2/unsupported/__init__.py new file mode 100644 index 00000000..40175a4b --- /dev/null +++ b/python/codac2/unsupported/__init__.py @@ -0,0 +1 @@ +from codac2._unsupported import * \ No newline at end of file