order of parameter for lcc vtk functions

Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_vtk_io.cpp

@@ -1,14 +1,19 @@
 #include <CGAL/Linear_cell_complex_for_combinatorial_map.h>
 #include <CGAL/Linear_cell_complex/IO/VTK.h>
-#include <CGAL/Combinatorial_map_save_load.h>
 #include <vector>
 #include <cstdlib>
 
 int main()
 {
   CGAL::Linear_cell_complex_for_combinatorial_map<3> lcc;
-  CGAL::load_combinatorial_map("data/beam-with-mixed-cells.3map", lcc);
+  std::ifstream is("data/beam-with-mixed-cells.3map");
+  if(!is)
+  {
+    std::cout<<"Error opening data/beam-with-mixed-cells.3map."<<std::endl;
+    return EXIT_FAILURE;
+  }
 
+  is>>lcc;
   // Compute per-volume vertex count
   std::vector<std::size_t> volume_scalars;
   for(auto it=lcc.template one_dart_per_cell<3>().begin(),
@@ -20,7 +25,7 @@ int main()
 
   if(!CGAL::IO::write_VTK("beam-with-mixed-cells.vtk", lcc, nullptr,
                           &volume_scalars))
-    { return EXIT_FAILURE; }
+  { std::cout<<"Error for write_VTK."<<std::endl; return EXIT_FAILURE; }
 
   return EXIT_SUCCESS;
 }

Linear_cell_complex/include/CGAL/Linear_cell_complex/IO/VTK.h

@@ -597,8 +597,7 @@ bool write_lcc_topo_to_vtk_ascii(std::ostream& os, const LCC& alcc,
 
 ////////////////////////////////////////////////////////////////////////////////////
 template <typename LCC, typename VertexScalarType, typename VolumeScalarType>
-bool read_VTK(LCC& alcc,
+bool read_VTK(const char* filename, LCC& alcc,
-              const char* filename,
               std::vector<VertexScalarType>* vertex_scalars,
               std::vector<VolumeScalarType>* volume_scalars)
 {
@@ -614,25 +613,21 @@ bool read_VTK(LCC& alcc,
 }
 
 template <typename LCC>
-bool read_VTK(LCC& alcc,
+bool read_VTK(const char* filename, LCC& alcc)
-    const char* filename)
+{ return read_VTK<LCC, float, float>(filename, alcc, nullptr, nullptr); }
-{ return read_VTK<LCC, float, float>
-      (alcc, filename, nullptr, nullptr); }
 
 template <typename LCC, typename VertexScalarType>
-bool read_VTK(LCC& alcc,
+bool read_VTK(const char* filename, LCC& alcc,
-    const char* filename,
               std::vector<VertexScalarType>* vertex_scalars)
 { return read_VTK<LCC, VertexScalarType, float>
-      (alcc, filename, vertex_scalars, nullptr); }
+      (filename, alcc, vertex_scalars, nullptr); }
 
 template <typename LCC, typename VolumeScalarType>
-bool read_VTK(LCC& alcc,
+bool read_VTK(const char* filename, LCC& alcc,
-    const char* filename,
               std::nullptr_t,
               std::vector<VolumeScalarType>* volume_scalars)
 { return read_VTK<LCC, float, VolumeScalarType>
-      (alcc, filename, nullptr, volume_scalars); }
+      (filename, alcc, nullptr, volume_scalars); }
 ////////////////////////////////////////////////////////////////////////////////////
 template <typename LCC, typename PointFunctor, typename CellFunctor>
 inline bool write_VTK_with_fct(const char* filename, const LCC& alcc,
@@ -691,14 +686,14 @@ bool write_VTK(const char* filename, const LCC& alcc,
 template <typename LCC>
 bool write_VTK(const char* filename, const LCC& alcc)
 {
-  return write_VTK<LCC, float, float>(alcc, filename, nullptr, nullptr);
+  return write_VTK<LCC, float, float>(filename, alcc, nullptr, nullptr);
 }
 
 template <typename LCC, typename VertexScalarType>
 bool write_VTK(const char* filename, const LCC& alcc,
                const std::vector<VertexScalarType>* vertex_scalars)
 {
-  return write_VTK<LCC, VertexScalarType, float>(alcc, filename, vertex_scalars,
+  return write_VTK<LCC, VertexScalarType, float>(filename, alcc, vertex_scalars,
                                                  nullptr);
 }
 
@@ -707,7 +702,7 @@ bool write_VTK(const char* filename, const LCC& alcc,
                std::nullptr_t,
                const std::vector<VolumeScalarType>* volume_scalars)
 {
-  return write_VTK<LCC, float, VolumeScalarType>(alcc, filename, nullptr,
+  return write_VTK<LCC, float, VolumeScalarType>(filename, alcc, nullptr,
                                                  volume_scalars);
 }
 ////////////////////////////////////////////////////////////////////////////////////