1.1 --- a/demo/Makefile.am	Wed Jul 13 14:05:49 2005 +0000
     1.2 +++ b/demo/Makefile.am	Wed Jul 13 14:17:13 2005 +0000
     1.3 @@ -12,6 +12,7 @@
     1.4  	min_route \
     1.5  	hello_lemon \
     1.6  	sub_graph_adaptor_demo \
     1.7 +	descriptor_map_demo \
     1.8  	coloring
     1.9  
    1.10  if HAVE_GLPK
    1.11 @@ -48,3 +49,5 @@
    1.12  
    1.13  lp_maxflow_demo_SOURCES = lp_maxflow_demo.cc
    1.14  lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
    1.15 +
    1.16 +descriptor_map_demo_SOURCES = descriptor_map_demo.cc
    1.17 \ No newline at end of file

     2.1 --- a/demo/descriptor_map_demo.cc	Wed Jul 13 14:05:49 2005 +0000
     2.2 +++ b/demo/descriptor_map_demo.cc	Wed Jul 13 14:17:13 2005 +0000
     2.3 @@ -1,8 +1,26 @@
     2.4 +/* -*- C++ -*-
     2.5 + * demo/descriptor_map_demo.cc - Part of LEMON, a generic C++ optimization library
     2.6 + *
     2.7 + * Copyright (C) 2005 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
     2.8 + * (Egervary Research Group on Combinatorial Optimization, EGRES).
     2.9 + *
    2.10 + * Permission to use, modify and distribute this software is granted
    2.11 + * provided that this copyright notice appears in all copies. For
    2.12 + * precise terms see the accompanying LICENSE file.
    2.13 + *
    2.14 + * This software is provided "AS IS" with no warranty of any kind,
    2.15 + * express or implied, and with no claim as to its suitability for any
    2.16 + * purpose.
    2.17 + *
    2.18 + */
    2.19 +
    2.20  #include <lemon/list_graph.h>
    2.21  #include <lemon/graph_utils.h>
    2.22 +#include <lemon/graph_writer.h>
    2.23  #include <lemon/xy.h>
    2.24 +#include <lemon/graph_to_eps.h>
    2.25  
    2.26 -#include <lemon/graph_to_eps.h>
    2.27 +#include <iostream>
    2.28  
    2.29  #include <cstdlib>
    2.30  #include <cmath>
    2.31 @@ -50,7 +68,9 @@
    2.32    typedef Graph::Edge Edge;
    2.33    
    2.34    // Generating a graph
    2.35 -  
    2.36 +
    2.37 +  std::cout << "Generating graph: " << std::endl;
    2.38 +
    2.39    Graph graph;
    2.40    
    2.41    const int NODE = 16;
    2.42 @@ -78,6 +98,11 @@
    2.43      graph.addEdge(nodeInv[si], nodeInv[ti]);
    2.44    }
    2.45  
    2.46 +  GraphWriter<Graph>(std::cout, graph).run();
    2.47 +
    2.48 +  std::cout << std::endl;
    2.49 +  std::cout << "Postscript file: descriptor_map_demo.eps" << std::endl;
    2.50 +
    2.51    // Make postscript from the graph.
    2.52      
    2.53    CircleMap<Graph> coords(graph, xy<double>(0.0, 0.0), 10.0);