diff --git a/.github/workflows/github-opengjk-examples.yml b/.github/workflows/github-opengjk-examples.yml index 51a5655..11f8bf5 100644 --- a/.github/workflows/github-opengjk-examples.yml +++ b/.github/workflows/github-opengjk-examples.yml @@ -31,3 +31,11 @@ jobs: - name: Check out repository code uses: actions/checkout@v3 - run: cd examples/matlab/; octave runme.m + + Run_CYthon_example: + runs-on: ubuntu-latest + container: mmontanari/devenv:buildenv-ubuntu + steps: + - name: Check out repository code + uses: actions/checkout@v3 + - run: cd examples/cython/; python3 setup.py build_ext --inplace; python3 test.py diff --git a/examples/cython/pygjk_trial.py b/examples/cython/pygjk_trial.py index 3b68b7a..d0f05be 100644 --- a/examples/cython/pygjk_trial.py +++ b/examples/cython/pygjk_trial.py @@ -1,38 +1,30 @@ -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # -# ##### # # # # -# #### ##### ###### # # # # # # # # -# # # # # # ## # # # # # # -# # # # # ##### # # # # #### # ### # -# # # ##### # # # # # # # # # # # -# # # # # # ## # # # # # # # -# #### # ###### # # ##### ##### # # # -# # -# This file is part of openGJK. # -# # -# OpenGJK is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# any later version. # -# # -# OpenGJK is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See The # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with OpenGJK. If not, see . # -# # -# openGJK: open-source Gilbert-Johnson-Keerthi algorithm # -# Copyright (C) Mattia Montanari 2018 - 2020 # -# http://iel.eng.ox.ac.uk/?page_id=504 # -# # -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # +# _____ _ _ __ # +# / ____| | | |/ / # +# ___ _ __ ___ _ __ | | __ | | ' / # +# / _ \| '_ \ / _ \ '_ \| | |_ |_ | | < # +# | (_) | |_) | __/ | | | |__| | |__| | . \ # +# \___/| .__/ \___|_| |_|\_____|\____/|_|\_\ # +# | | # +# |_| # +# # +# Copyright 2022 Mattia Montanari, University of Oxford # +# # +# This program is free software: you can redistribute it and/or modify it under # +# the terms of the GNU General Public License as published by the Free Software # +# Foundation, either version 3 of the License. You should have received a copy # +# of the GNU General Public License along with this program. If not, visit # +# # +# https://www.gnu.org/licenses/ # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # +# FOR A PARTICULAR PURPOSE. See GNU General Public License for details. # import numpy as np import openGJK_cython as opengjk -a = np.array([[1.,1.,1.],[1.,1.,1.]]) -b = np.array([[11.,1.,1.],[1.,1.,1.]]) +a = np.array([[1.0,1.0,1.0],[1.0,1.0,1.0]]) +b = np.array([[-1.,-1.,-1.],[-1.,-1.,-1.]]) d = opengjk.pygjk(a,b) -print(d) \ No newline at end of file +print("Distance is:" , d) \ No newline at end of file diff --git a/examples/cython/setup.py b/examples/cython/setup.py index 5805e75..48f074e 100644 --- a/examples/cython/setup.py +++ b/examples/cython/setup.py @@ -34,8 +34,7 @@ from Cython.Build import cythonize exts = Extension( "openGJK_cython", sources = ["openGJK_cython.pyx"], - extra_compile_args=['-I../../include/','-fopenmp'], - extra_link_args=['-fopenmp'], + extra_compile_args=['-I../../include/'] ) setup(