diff --git a/Alpha_shapes_3/changes.txt b/Alpha_shapes_3/changes.txt index ea2bcdac51f..e887a579cee 100644 --- a/Alpha_shapes_3/changes.txt +++ b/Alpha_shapes_3/changes.txt @@ -1,3 +1,6 @@ +9 March 2006 Andreas Fabri +- Changed names of examples + 6 March 2006 Andreas Fabri - Changed void* to Vertex_handle and Cell_handle in some reference manual pages diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/Makefile b/Alpha_shapes_3/demo/Alpha_shapes_3/Makefile index 3a7e21084aa..26121b53c1c 100644 --- a/Alpha_shapes_3/demo/Alpha_shapes_3/Makefile +++ b/Alpha_shapes_3/demo/Alpha_shapes_3/Makefile @@ -7,43 +7,17 @@ #CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.3-I-76/make/makefile_sparc_SunOS-5.6_g++-2.95.3_LEDA - -# for cygwin -#\prisme\CGAL\CGAL-2.1-I-30\make\makefile_i686_CYGWINNT-4.0-20.1_CL.EXE-12.00.8168 - -# for others -#$(UTIL)/CGAL-I/make/makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA -#makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA -#makefile_sparc_SunOS-5.6_g++-2.95.1_LEDA -#makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA -#makefile_i686_Linux-2.2.7_eg++-egcs-2.91.66_LEDA -#makefile_i686_Linux-2.2.7_g++-2.95.1_LEDA -#makefile_i686_Linux-2.2.10_g++-2.95.2_LEDA - -#CGAL_MAKEFILE=d:/cgal/CGAL-2.4-I-71/make/makefile_i686_CYGWINNT-5.0-1.3.3_bcc32.exe-5.51 - include $(CGAL_MAKEFILE) # ---------------------------------------------------------------------# # compiler flags #----------------------------------------------------------------------# -# rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local CXXFLAGS = -I../../include \ - -I../../../Triangulation_3/include \ $(CGAL_CXXFLAGS) \ -g -# -mcpu=ultrasparc -mtune=ultrasparc \ -# -B /u/alcor/0/prisme_util/Binutils/SunOS/bin/ -# for cygwin -#'-Iz:\Cgal-2.0\To_submit\Alpha_shapes_2\include' \ - -# for others -#-I$(HOME)/Cgal-2.0/To_submit/Alpha_shapes_2/include \ -#-mcpu=ultrasparc -mtune=ultrasparc -Wall -W -O2 -DDEBUG -#-B /u/alcor/0/prisme_util/Binutils/SunOS/bin/ #---------------------------------------------------------------------# # linker flags #---------------------------------------------------------------------# @@ -56,17 +30,17 @@ LDFLAGS = $(CGAL_WINDOW_LDFLAGS) # target entries #---------------------------------------------------------------------# -all: demo_alpha$(EXE_EXT) demo_weight$(EXE_EXT) +all: alpha_shapes_3$(EXE_EXT) weighted_alpha_shapes_3$(EXE_EXT) -demo_alpha$(EXE_EXT): demo_alpha$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo_alpha demo_alpha$(OBJ_EXT) $(LDFLAGS) +alpha_shapes_3$(EXE_EXT): alpha_shapes_3$(OBJ_EXT) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)alpha_shapes_3 alpha_shapes_3$(OBJ_EXT) $(LDFLAGS) -demo_weight$(EXE_EXT): demo_weight$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo_weight demo_weight$(OBJ_EXT) $(LDFLAGS) +weighted_alpha_shapes_3$(EXE_EXT): weighted_alpha_shapes_3$(OBJ_EXT) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)weighted_alpha_shapes_3 weighted_alpha_shapes_3$(OBJ_EXT) $(LDFLAGS) clean: \rm -f *.o *.obj *.exe \ - demo_alpha$(EXE_EXT) demo_weight$(EXE_EXT) \ + alpha_shapes_3$(EXE_EXT) weighted_alpha_shapes_3$(EXE_EXT) \ core #---------------------------------------------------------------------# diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/demo_alpha.C b/Alpha_shapes_3/demo/Alpha_shapes_3/alpha_shapes_3.C similarity index 100% rename from Alpha_shapes_3/demo/Alpha_shapes_3/demo_alpha.C rename to Alpha_shapes_3/demo/Alpha_shapes_3/alpha_shapes_3.C diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/demo_weight.C b/Alpha_shapes_3/demo/Alpha_shapes_3/weighted_alpha_shapes_3.C similarity index 100% rename from Alpha_shapes_3/demo/Alpha_shapes_3/demo_weight.C rename to Alpha_shapes_3/demo/Alpha_shapes_3/weighted_alpha_shapes_3.C diff --git a/Alpha_shapes_3/doc_tex/Alpha_shapes_3/alpha3.tex b/Alpha_shapes_3/doc_tex/Alpha_shapes_3/alpha3.tex index f2ac7a6702e..b338138bae9 100644 --- a/Alpha_shapes_3/doc_tex/Alpha_shapes_3/alpha3.tex +++ b/Alpha_shapes_3/doc_tex/Alpha_shapes_3/alpha3.tex @@ -229,7 +229,7 @@ This example builds a basic alpha shape using a Delaunay triangulation as underlying triangulation. -\ccIncludeExampleCode{Alpha_shapes_3/example_alpha.C} +\ccIncludeExampleCode{Alpha_shapes_3/alpha_shapes_3.C} \subsection{Building Basic Alpha Shapes for Many Points} @@ -237,7 +237,7 @@ When many points are input in the alpha shape, say more than 10 000, it pays off to use a triangulation hierarchy as underlying triangulation (cf. \ref{T3-concept-hierarchy}). -\ccIncludeExampleCode{Alpha_shapes_3/example_big_alpha.C} +\ccIncludeExampleCode{Alpha_shapes_3/alpha_shapes_with_hierarchy_3.C} %---------------------------------------------------------------------- \subsection{Example for Weighted Alpha-Shapes\label{I1_SectWeightedAS3D}} @@ -247,4 +247,4 @@ regular triangulation as underlying triangulation. The alpha shape is build in \ccc{GENERAL} mode. -\ccIncludeExampleCode{Alpha_shapes_3/example_weight.C} +\ccIncludeExampleCode{Alpha_shapes_3/weighted_alpha_shapes_3.C} diff --git a/Alpha_shapes_3/examples/Alpha_shapes_3/Makefile b/Alpha_shapes_3/examples/Alpha_shapes_3/Makefile index 71094478160..0a4397611e1 100644 --- a/Alpha_shapes_3/examples/Alpha_shapes_3/Makefile +++ b/Alpha_shapes_3/examples/Alpha_shapes_3/Makefile @@ -35,23 +35,23 @@ LDFLAGS = \ #---------------------------------------------------------------------# all: \ - example_alpha$(EXE_EXT) \ - example_big_alpha$(EXE_EXT) \ - example_weight$(EXE_EXT) + alpha_shapes_3$(EXE_EXT) \ + alpha_shapes_with_hierarchy_3$(EXE_EXT) \ + weighted_alpha_shapes_3$(EXE_EXT) -example_alpha$(EXE_EXT): example_alpha$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)example_alpha example_alpha$(OBJ_EXT) $(LDFLAGS) +alpha_shapes_3$(EXE_EXT): alpha_shapes_3$(OBJ_EXT) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)alpha_shapes_3 alpha_shapes_3$(OBJ_EXT) $(LDFLAGS) -example_big_alpha$(EXE_EXT): example_big_alpha$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)example_big_alpha example_big_alpha$(OBJ_EXT) $(LDFLAGS) +alpha_shapes_with_hierarchy_3$(EXE_EXT): alpha_shapes_with_hierarchy_3$(OBJ_EXT) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)alpha_shapes_with_hierarchy_3 alpha_shapes_with_hierarchy_3$(OBJ_EXT) $(LDFLAGS) -example_weight$(EXE_EXT): example_weight$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)example_weight example_weight$(OBJ_EXT) $(LDFLAGS) +weighted_alpha_shapes_3$(EXE_EXT): weighted_alpha_shapes_3$(OBJ_EXT) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)weighted_alpha_shapes_3 weighted_alpha_shapes_3$(OBJ_EXT) $(LDFLAGS) clean: \ - example_alpha.clean \ - example_big_alpha.clean \ - example_weight.clean + alpha_shapes_3.clean \ + alpha_shapes_with_hierarchy_3.clean \ + weighted_alpha_shapes_3.clean #---------------------------------------------------------------------# # suffix rules diff --git a/Alpha_shapes_3/examples/Alpha_shapes_3/example_alpha.C b/Alpha_shapes_3/examples/Alpha_shapes_3/alpha_shapes_3.C similarity index 100% rename from Alpha_shapes_3/examples/Alpha_shapes_3/example_alpha.C rename to Alpha_shapes_3/examples/Alpha_shapes_3/alpha_shapes_3.C diff --git a/Alpha_shapes_3/examples/Alpha_shapes_3/example_big_alpha.C b/Alpha_shapes_3/examples/Alpha_shapes_3/alpha_shapes_with_hierarchy_3.C similarity index 100% rename from Alpha_shapes_3/examples/Alpha_shapes_3/example_big_alpha.C rename to Alpha_shapes_3/examples/Alpha_shapes_3/alpha_shapes_with_hierarchy_3.C diff --git a/Alpha_shapes_3/examples/Alpha_shapes_3/example_weight.C b/Alpha_shapes_3/examples/Alpha_shapes_3/weighted_alpha_shapes_3.C similarity index 100% rename from Alpha_shapes_3/examples/Alpha_shapes_3/example_weight.C rename to Alpha_shapes_3/examples/Alpha_shapes_3/weighted_alpha_shapes_3.C