diff --git a/Skin_surface_3/examples/Skin_surface_3/include/extract_balls_from_pdb.h b/Skin_surface_3/examples/Skin_surface_3/include/extract_balls_from_pdb.h index 42d3c7d23d2..5d86a658df1 100644 --- a/Skin_surface_3/examples/Skin_surface_3/include/extract_balls_from_pdb.h +++ b/Skin_surface_3/examples/Skin_surface_3/include/extract_balls_from_pdb.h @@ -8,19 +8,8 @@ #ifndef EXTRACT_BALLS_FROM_PDB_H #define EXTRACT_BALLS_FROM_PDB_H -// include the source files, since the generated makefile -// cannot link multiple object files -#include "dsrpdb/lib/pdb_utils.cc" -#include "dsrpdb/lib/Residue.cc" -#include "dsrpdb/lib/Protein.cc" -#include "dsrpdb/lib/Error_logger.cc" -#include "dsrpdb/lib/Protein_pdb.cc" -#include "dsrpdb/lib/Model.cc" -#include "dsrpdb/lib/PDB.cc" -#include "dsrpdb/lib/Residue_data.cc" - -#include "dsrpdb/PDB.h" -#include "dsrpdb/geometry.h" +#include +#include #include template @@ -34,8 +23,8 @@ void extract_balls_from_pdb(char *filename, std::cerr << "Error opening input file " << filename << std::endl; } - dsrpdb::PDB pdb(in, true); - dsrpdb::all_weighted_points(pdb, t, weighted_points); + CGAL::PDB::PDB pdb(in, true); + CGAL::PDB::all_weighted_points(pdb.model(0), t, weighted_points); } diff --git a/Skin_surface_3/examples/Skin_surface_3/skin_surface_pdb_reader.cpp b/Skin_surface_3/examples/Skin_surface_3/skin_surface_pdb_reader.cpp index 2d7a78c760f..11de1164f5c 100644 --- a/Skin_surface_3/examples/Skin_surface_3/skin_surface_pdb_reader.cpp +++ b/Skin_surface_3/examples/Skin_surface_3/skin_surface_pdb_reader.cpp @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) { double shrinkfactor = 0.5; // Retrieve input balls: - extract_balls_from_pdb(filename, K(), std::back_inserter(l)); + extract_balls_from_pdb(filename, Traits(), std::back_inserter(l)); // Construct skin surface: Skin_surface_3 skin_surface(l.begin(), l.end(), shrinkfactor);