diff options
author | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-12 05:43:06 +0000 |
---|---|---|
committer | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-12 05:43:06 +0000 |
commit | ad6a64ad5a4f4121410250021eda0904eb9c718c (patch) | |
tree | fdad2e783a79b388cde1826e3b344d8977d1183a /data/points/generator | |
parent | f9a32a464156dd61b444f0e70c8342642363e8ea (diff) | |
parent | f0e5330a88f9e89a887769ab79f6db6dd4e1c35a (diff) |
Merge from trunk.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/qt5@1848 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: c8e1376894207c8c08896f750f71c115e07f6d95
Diffstat (limited to 'data/points/generator')
-rw-r--r-- | data/points/generator/CMakeLists.txt | 33 | ||||
-rw-r--r-- | data/points/generator/README | 20 | ||||
-rwxr-xr-x | data/points/generator/aurelien_alvarez_surfaces_in_R8.py | 90 |
3 files changed, 114 insertions, 29 deletions
diff --git a/data/points/generator/CMakeLists.txt b/data/points/generator/CMakeLists.txt index 26b44446..f559610c 100644 --- a/data/points/generator/CMakeLists.txt +++ b/data/points/generator/CMakeLists.txt @@ -1,32 +1,11 @@ cmake_minimum_required(VERSION 2.6) -project(GUDHIPointsGenerator) +project(Data_points_generator) if(CGAL_FOUND) if (NOT CGAL_VERSION VERSION_LESS 4.6.0) - message(STATUS "CGAL version: ${CGAL_VERSION}.") - - include( ${CGAL_USE_FILE} ) - # In CMakeLists.txt, when include(${CGAL_USE_FILE}), CXX_FLAGS are overwritten. - # cf. http://doc.cgal.org/latest/Manual/installation.html#title40 - # A workaround is to add "-std=c++11" again. - # A fix would be to use https://cmake.org/cmake/help/v3.1/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html - # or even better https://cmake.org/cmake/help/v3.1/variable/CMAKE_CXX_STANDARD.html - # but it implies to use cmake version 3.1 at least. - if(NOT MSVC) - include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG(-std=c++11 COMPILER_SUPPORTS_CXX11) - if(COMPILER_SUPPORTS_CXX11) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - endif() - # - End of workaround - - find_package(Eigen3 3.1.0) if (EIGEN3_FOUND) - include( ${EIGEN3_USE_FILE} ) - include_directories (BEFORE "../../include") - add_executable ( hypergenerator hypergenerator.cpp ) + target_link_libraries(hypergenerator ${Boost_SYSTEM_LIBRARY}) add_test(hypergenerator_on_sphere_3000_10_5.0 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator on sphere onSphere.off 3000 10 5.0) add_test(hypergenerator_on_sphere_10000_3 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator on sphere onSphere.off 10000 3) add_test(hypergenerator_in_sphere_7000_12_10.8 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in sphere inSphere.off 7000 12 10.8) @@ -34,8 +13,6 @@ if(CGAL_FOUND) # on cube is not available in CGAL add_test(hypergenerator_in_cube_7000_12_10.8 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in cube inCube.off 7000 12 10.8) add_test(hypergenerator_in_cube_50000_2 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in cube inCube.off 50000 3) - endif() - else() - message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile hypergenerator. Version 4.6.0 is required.") - endif () -endif() + endif(EIGEN3_FOUND) + endif(NOT CGAL_VERSION VERSION_LESS 4.6.0) +endif(CGAL_FOUND) diff --git a/data/points/generator/README b/data/points/generator/README index e6b28eb0..41cb9165 100644 --- a/data/points/generator/README +++ b/data/points/generator/README @@ -1,10 +1,13 @@ -To build the example, run in a Terminal: +=========================== C++ generators ===================================== + +To build the C++ generators, run in a Terminal: cd /path-to-gudhi/ cmake . cd /path-to-data-generator/ make +=========================== hypergenerator ===================================== Example of use : @@ -24,3 +27,18 @@ Example of use : !! Warning: hypegenerator on cube is not available !! +===================== aurelien_alvarez_surfaces_in_R8 ========================== + +This generator is written in Python. + +This code generates points on a family of surfaces living in CP^2. You can move +in the family thanks to the parameter "degre". The parameter "nombrePoints" +allows to choose the number of points on the chosen surface. Finally, to compute +the points, we choose a chart in C^2 and take points randomly in the x-variable, +so that you may also modify the window for x in the complex plane (parameter +"module_x"). + +After that, the program computes points in C^2, then maps them in R^8, so that +the points live on a surface which is compact (which is not the case for the +intersection of the surface with C^2). We end off with a bunch of points on a +compact surface in R^8. diff --git a/data/points/generator/aurelien_alvarez_surfaces_in_R8.py b/data/points/generator/aurelien_alvarez_surfaces_in_R8.py new file mode 100755 index 00000000..57773c4c --- /dev/null +++ b/data/points/generator/aurelien_alvarez_surfaces_in_R8.py @@ -0,0 +1,90 @@ +# This file is part of the Gudhi Library. The Gudhi library +# (Geometric Understanding in Higher Dimensions) is a generic C++ +# library for computational topology. +# +# Author(s): Aurélien Alvarez +# +# Copyright (C) 2016 Université d'Orléans (France) +# +# 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, or +# (at your option) any later version. +# +# 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 the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import numpy as np +import random +from math import factorial + +I = complex(0,1) + +################################################# +################################################# + +#Surface réelle d'équation x.conj(y)^d + y.conj(z)^d + z.conj(x)^d = 0 dans P2(C) +#Équation affine (z=1) multipliée par sa conjuguée (d = 2) : x.conj(x)^2.y^4 + 2x^3.conj(x).y^2 + y + conj(x)^2 + x^5 = 0 +def equationAffineSurfaceReelle(x): + polynome = [0]*(degre**2+1) + for k in range(degre+1): + polynome[k*degre] = (-1)**degre*x*factorial(degre)/(factorial(k)*factorial(degre-k))*x**(k*degre)*np.conjugate(x)**(degre-k) + polynome[-2] += 1 + polynome[-1] += np.conjugate(x)**degre + return polynome + +################################################# +################################################# + +def calculRacines(equation,nombrePoints,module_x): + racines = [[1,0,0],[0,1,0],[0,0,1]] + for _ in range(nombrePoints): + x = module_x*(2*random.random()-1+I*(2*random.random()-1)) + fool = [[[x,y,1],[y,1,x],[1,x,y]] for y in np.roots(equation(x)) if abs(x*np.conjugate(y)**degre+y+np.conjugate(x)**degre) < 0.0001] + for bar in fool: + racines += bar + return racines + +################################################# +################################################# + +def plongementDansR8(pointDansCP2): + z0 = pointDansCP2[0] + z1 = pointDansCP2[1] + z2 = pointDansCP2[2] + a = z0*np.conjugate(z0) + b = z1*np.conjugate(z1) + c = z2*np.conjugate(z2) + normeCarree = a+b+c + a = a/normeCarree + b = b/normeCarree + u = z0*np.conjugate(z1)/normeCarree + v = z0*np.conjugate(z2)/normeCarree + w = z1*np.conjugate(z2)/normeCarree + return [a.real,b.real,u.real,u.imag,v.real,v.imag,w.real,w.imag] + +def plongementListeDansR8(listePointsDansCP2): + listePointsDansR8 = [] + for point in listePointsDansCP2: + listePointsDansR8 += [plongementDansR8(point)] + return listePointsDansR8 + +################################################# +################################################# + +degre = 3 +nombrePoints = 10**4 +module_x = 10 + +with open("surface.txt","w") as fichier: + bar = calculRacines(equationAffineSurfaceReelle,nombrePoints,module_x) + listePoints = plongementListeDansR8(bar) + fichier.write(str(len(bar)) + "\n") + for point in listePoints: + fichier.write(str(point[0]) + " " + str(point[1]) + " " + str(point[2]) + " " + str(point[3]) + " " + str(point[4]) + " " + str(point[5]) + " " + str(point[6]) + " " + str(point[7]) + "\n") + |