gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge #382 to branch 1.0
0 4 1
merge 1.0
1 file changed with 204 insertions and 7 deletions:
↑ Collapse diff ↑
Ignore white space 6 line context
1
/* -*- mode: C++; indent-tabs-mode: nil; -*-
2
 *
3
 * This file is a part of LEMON, a generic C++ optimization library.
4
 *
5
 * Copyright (C) 2003-2011
6
 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
7
 * (Egervary Research Group on Combinatorial Optimization, EGRES).
8
 *
9
 * Permission to use, modify and distribute this software is granted
10
 * provided that this copyright notice appears in all copies. For
11
 * precise terms see the accompanying LICENSE file.
12
 *
13
 * This software is provided "AS IS" with no warranty of any kind,
14
 * express or implied, and with no claim as to its suitability for any
15
 * purpose.
16
 *
17
 */
18

	
19
#include <lemon/list_graph.h>
20
#include <lemon/lgf_reader.h>
21
#include "test_tools.h"
22

	
23
using namespace lemon;
24

	
25
char test_lgf[] =
26
  "@nodes\n"
27
  "label\n"
28
  "0\n"
29
  "1\n"
30
  "@arcs\n"
31
  "     label\n"
32
  "0 1  0\n"
33
  "1 0  1\n"
34
  "@attributes\n"
35
  "source 0\n"
36
  "target 1\n";
37

	
38
char test_lgf_nomap[] =
39
  "@nodes\n"
40
  "label\n"
41
  "0\n"
42
  "1\n"
43
  "@arcs\n"
44
  "     -\n"
45
  "0 1\n";
46

	
47
char test_lgf_bad1[] =
48
  "@nodes\n"
49
  "label\n"
50
  "0\n"
51
  "1\n"
52
  "@arcs\n"
53
  "     - another\n"
54
  "0 1\n";
55

	
56
char test_lgf_bad2[] =
57
  "@nodes\n"
58
  "label\n"
59
  "0\n"
60
  "1\n"
61
  "@arcs\n"
62
  "     label -\n"
63
  "0 1\n";
64

	
65

	
66
int main() 
67
{
68
  {
69
    ListDigraph d; 
70
    ListDigraph::Node s,t;
71
    ListDigraph::ArcMap<int> label(d);
72
    std::istringstream input(test_lgf);
73
    digraphReader(d, input).
74
      node("source", s).
75
      node("target", t).
76
      arcMap("label", label).
77
      run();
78
    check(countNodes(d) == 2,"There should be 2 nodes");
79
    check(countArcs(d) == 2,"There should be 2 arcs");
80
  }
81
  {
82
    ListGraph g;
83
    ListGraph::Node s,t;
84
    ListGraph::EdgeMap<int> label(g);
85
    std::istringstream input(test_lgf);
86
    graphReader(g, input).
87
      node("source", s).
88
      node("target", t).
89
      edgeMap("label", label).
90
      run();
91
    check(countNodes(g) == 2,"There should be 2 nodes");
92
    check(countEdges(g) == 2,"There should be 2 arcs");
93
  }
94

	
95
  {
96
    ListDigraph d; 
97
    std::istringstream input(test_lgf_nomap);
98
    digraphReader(d, input).
99
      run();
100
    check(countNodes(d) == 2,"There should be 2 nodes");
101
    check(countArcs(d) == 1,"There should be 1 arc");
102
  }
103
  {
104
    ListGraph g;
105
    std::istringstream input(test_lgf_nomap);
106
    graphReader(g, input).
107
      run();
108
    check(countNodes(g) == 2,"There should be 2 nodes");
109
    check(countEdges(g) == 1,"There should be 1 edge");
110
  }
111

	
112
  {
113
    ListDigraph d; 
114
    std::istringstream input(test_lgf_bad1);
115
    bool ok=false;
116
    try {
117
      digraphReader(d, input).
118
        run();
119
    }
120
    catch (FormatError& error) 
121
      {
122
        ok = true;
123
      }
124
    check(ok,"FormatError exception should have occured");
125
  }
126
  {
127
    ListGraph g;
128
    std::istringstream input(test_lgf_bad1);
129
    bool ok=false;
130
    try {
131
      graphReader(g, input).
132
        run();
133
    }
134
    catch (FormatError& error)
135
      {
136
        ok = true;
137
      }
138
    check(ok,"FormatError exception should have occured");
139
  }
140

	
141
  {
142
    ListDigraph d; 
143
    std::istringstream input(test_lgf_bad2);
144
    bool ok=false;
145
    try {
146
      digraphReader(d, input).
147
        run();
148
    }
149
    catch (FormatError& error)
150
      {
151
        ok = true;
152
      }
153
    check(ok,"FormatError exception should have occured");
154
  }
155
  {
156
    ListGraph g;
157
    std::istringstream input(test_lgf_bad2);
158
    bool ok=false;
159
    try {
160
      graphReader(g, input).
161
        run();
162
    }
163
    catch (FormatError& error)
164
      {
165
        ok = true;
166
      }
167
    check(ok,"FormatError exception should have occured");
168
  }
169
}
Ignore white space 6 line context
1 1
/* -*- mode: C++; indent-tabs-mode: nil; -*-
2 2
 *
3 3
 * This file is a part of LEMON, a generic C++ optimization library.
4 4
 *
5 5
 * Copyright (C) 2003-2008
6 6
 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
7 7
 * (Egervary Research Group on Combinatorial Optimization, EGRES).
8 8
 *
9 9
 * Permission to use, modify and distribute this software is granted
10 10
 * provided that this copyright notice appears in all copies. For
11 11
 * precise terms see the accompanying LICENSE file.
12 12
 *
13 13
 * This software is provided "AS IS" with no warranty of any kind,
14 14
 * express or implied, and with no claim as to its suitability for any
15 15
 * purpose.
16 16
 *
17 17
 */
18 18

	
19 19
namespace lemon {
20 20
/*!
21 21

	
22 22

	
23 23

	
24 24
\page lgf-format LEMON Graph Format (LGF)
25 25

	
26 26
The \e LGF is a <em>column oriented</em>
27 27
file format for storing graphs and associated data like
28 28
node and edge maps.
29 29

	
30 30
Each line with \c '#' first non-whitespace
31 31
character is considered as a comment line.
32 32

	
33 33
Otherwise the file consists of sections starting with
34 34
a header line. The header lines starts with an \c '@' character followed by the
35 35
type of section. The standard section types are \c \@nodes, \c
36 36
\@arcs and \c \@edges
37 37
and \@attributes. Each header line may also have an optional
38 38
\e name, which can be use to distinguish the sections of the same
39 39
type.
40 40

	
41 41
The standard sections are column oriented, each line consists of
42 42
<em>token</em>s separated by whitespaces. A token can be \e plain or
43 43
\e quoted. A plain token is just a sequence of non-whitespace characters,
44 44
while a quoted token is a
45 45
character sequence surrounded by double quotes, and it can also
46 46
contain whitespaces and escape sequences.
47 47

	
48 48
The \c \@nodes section describes a set of nodes and associated
49 49
maps. The first is a header line, its columns are the names of the
50 50
maps appearing in the following lines.
51 51
One of the maps must be called \c
52 52
"label", which plays special role in the file.
53 53
The following
54 54
non-empty lines until the next section describes nodes of the
55 55
graph. Each line contains the values of the node maps
56 56
associated to the current node.
57 57

	
58 58
\code
59 59
 @nodes
60 60
 label  coordinates  size    title
61 61
 1      (10,20)      10      "First node"
62 62
 2      (80,80)      8       "Second node"
63 63
 3      (40,10)      10      "Third node"
64 64
\endcode
65 65

	
66
The \c \@arcs section is very similar to the \c \@nodes section,
67
it again starts with a header line describing the names of the maps,
68
but the \c "label" map is not obligatory here. The following lines
69
describe the arcs. The first two tokens of each line are
70
the source and the target node of the arc, respectively, then come the map
66
The \c \@arcs section is very similar to the \c \@nodes section, it
67
again starts with a header line describing the names of the maps, but
68
the \c "label" map is not obligatory here. The following lines
69
describe the arcs. The first two tokens of each line are the source
70
and the target node of the arc, respectively, then come the map
71 71
values. The source and target tokens must be node labels.
72 72

	
73 73
\code
74 74
 @arcs
75 75
         capacity
76 76
 1   2   16
77 77
 1   3   12
78 78
 2   3   18
79 79
\endcode
80 80

	
81
If there is no map in the \c \@arcs section at all, then it must be
82
indicated by a sole '-' sign in the first line.
83

	
84
\code
85
 @arcs
86
         -
87
 1   2
88
 1   3
89
 2   3
90
\endcode
91

	
81 92
The \c \@edges is just a synonym of \c \@arcs. The \@arcs section can
82 93
also store the edge set of an undirected graph. In such case there is
83 94
a conventional method for store arc maps in the file, if two columns
84
has the same caption with \c '+' and \c '-' prefix, then these columns
95
have the same caption with \c '+' and \c '-' prefix, then these columns
85 96
can be regarded as the values of an arc map.
86 97

	
87 98
The \c \@attributes section contains key-value pairs, each line
88 99
consists of two tokens, an attribute name, and then an attribute
89 100
value. The value of the attribute could be also a label value of a
90 101
node or an edge, or even an edge label prefixed with \c '+' or \c '-',
91 102
which regards to the forward or backward directed arc of the
92 103
corresponding edge.
93 104

	
94 105
\code
95 106
 @attributes
96 107
 source 1
97 108
 target 3
98 109
 caption "LEMON test digraph"
99 110
\endcode
100 111

	
101 112
The \e LGF can contain extra sections, but there is no restriction on
102 113
the format of such sections.
103 114

	
104 115
*/
105 116
}
106 117

	
107 118
//  LocalWords:  whitespace whitespaces
Ignore white space 6 line context
1 1
/* -*- mode: C++; indent-tabs-mode: nil; -*-
2 2
 *
3 3
 * This file is a part of LEMON, a generic C++ optimization library.
4 4
 *
5
 * Copyright (C) 2003-2008
5
 * Copyright (C) 2003-2011
6 6
 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
7 7
 * (Egervary Research Group on Combinatorial Optimization, EGRES).
8 8
 *
9 9
 * Permission to use, modify and distribute this software is granted
10 10
 * provided that this copyright notice appears in all copies. For
11 11
 * precise terms see the accompanying LICENSE file.
12 12
 *
13 13
 * This software is provided "AS IS" with no warranty of any kind,
14 14
 * express or implied, and with no claim as to its suitability for any
15 15
 * purpose.
16 16
 *
17 17
 */
18 18

	
19 19
///\ingroup lemon_io
20 20
///\file
21 21
///\brief \ref lgf-format "LEMON Graph Format" reader.
22 22

	
23 23

	
24 24
#ifndef LEMON_LGF_READER_H
25 25
#define LEMON_LGF_READER_H
26 26

	
27 27
#include <iostream>
28 28
#include <fstream>
29 29
#include <sstream>
30 30

	
31 31
#include <set>
32 32
#include <map>
33 33

	
34 34
#include <lemon/core.h>
35 35

	
36 36
#include <lemon/lgf_writer.h>
37 37

	
38 38
#include <lemon/concept_check.h>
39 39
#include <lemon/concepts/maps.h>
40 40

	
41 41
namespace lemon {
42 42

	
43 43
  namespace _reader_bits {
44 44

	
45 45
    template <typename Value>
46 46
    struct DefaultConverter {
47 47
      Value operator()(const std::string& str) {
48 48
        std::istringstream is(str);
49 49
        Value value;
50 50
        if (!(is >> value)) {
51 51
          throw FormatError("Cannot read token");
52 52
        }
53 53

	
54 54
        char c;
55 55
        if (is >> std::ws >> c) {
56 56
          throw FormatError("Remaining characters in token");
57 57
        }
58 58
        return value;
59 59
      }
60 60
    };
61 61

	
62 62
    template <>
63 63
    struct DefaultConverter<std::string> {
64 64
      std::string operator()(const std::string& str) {
65 65
        return str;
66 66
      }
67 67
    };
68 68

	
69 69
    template <typename _Item>
70 70
    class MapStorageBase {
71 71
    public:
72 72
      typedef _Item Item;
73 73

	
74 74
    public:
75 75
      MapStorageBase() {}
76 76
      virtual ~MapStorageBase() {}
77 77

	
78 78
      virtual void set(const Item& item, const std::string& value) = 0;
79 79

	
80 80
    };
81 81

	
82 82
    template <typename _Item, typename _Map,
83 83
              typename _Converter = DefaultConverter<typename _Map::Value> >
84 84
    class MapStorage : public MapStorageBase<_Item> {
85 85
    public:
86 86
      typedef _Map Map;
87 87
      typedef _Converter Converter;
88 88
      typedef _Item Item;
89 89

	
90 90
    private:
91 91
      Map& _map;
92 92
      Converter _converter;
93 93

	
94 94
    public:
95 95
      MapStorage(Map& map, const Converter& converter = Converter())
96 96
        : _map(map), _converter(converter) {}
97 97
      virtual ~MapStorage() {}
98 98

	
99 99
      virtual void set(const Item& item ,const std::string& value) {
100 100
        _map.set(item, _converter(value));
101 101
      }
102 102
    };
103 103

	
104 104
    template <typename _Graph, bool _dir, typename _Map,
105 105
              typename _Converter = DefaultConverter<typename _Map::Value> >
106 106
    class GraphArcMapStorage : public MapStorageBase<typename _Graph::Edge> {
107 107
    public:
108 108
      typedef _Map Map;
109 109
      typedef _Converter Converter;
110 110
      typedef _Graph Graph;
111 111
      typedef typename Graph::Edge Item;
112 112
      static const bool dir = _dir;
113 113

	
114 114
    private:
115 115
      const Graph& _graph;
116 116
      Map& _map;
117 117
      Converter _converter;
118 118

	
119 119
    public:
120 120
      GraphArcMapStorage(const Graph& graph, Map& map,
121 121
                         const Converter& converter = Converter())
122 122
        : _graph(graph), _map(map), _converter(converter) {}
123 123
      virtual ~GraphArcMapStorage() {}
124 124

	
125 125
      virtual void set(const Item& item ,const std::string& value) {
126 126
        _map.set(_graph.direct(item, dir), _converter(value));
127 127
      }
128 128
    };
129 129

	
130 130
    class ValueStorageBase {
131 131
    public:
132 132
      ValueStorageBase() {}
133 133
      virtual ~ValueStorageBase() {}
134 134

	
135 135
      virtual void set(const std::string&) = 0;
136 136
    };
137 137

	
138 138
    template <typename _Value, typename _Converter = DefaultConverter<_Value> >
139 139
    class ValueStorage : public ValueStorageBase {
140 140
    public:
141 141
      typedef _Value Value;
142 142
      typedef _Converter Converter;
143 143

	
144 144
    private:
145 145
      Value& _value;
146 146
      Converter _converter;
147 147

	
148 148
    public:
149 149
      ValueStorage(Value& value, const Converter& converter = Converter())
150 150
        : _value(value), _converter(converter) {}
151 151

	
152 152
      virtual void set(const std::string& value) {
153 153
        _value = _converter(value);
154 154
      }
155 155
    };
156 156

	
157 157
    template <typename Value>
158 158
    struct MapLookUpConverter {
159 159
      const std::map<std::string, Value>& _map;
160 160

	
161 161
      MapLookUpConverter(const std::map<std::string, Value>& map)
162 162
        : _map(map) {}
163 163

	
164 164
      Value operator()(const std::string& str) {
165 165
        typename std::map<std::string, Value>::const_iterator it =
166 166
          _map.find(str);
167 167
        if (it == _map.end()) {
168 168
          std::ostringstream msg;
169 169
          msg << "Item not found: " << str;
170 170
          throw FormatError(msg.str());
171 171
        }
172 172
        return it->second;
173 173
      }
174 174
    };
175 175

	
176 176
    template <typename Graph>
177 177
    struct GraphArcLookUpConverter {
178 178
      const Graph& _graph;
179 179
      const std::map<std::string, typename Graph::Edge>& _map;
180 180

	
181 181
      GraphArcLookUpConverter(const Graph& graph,
182 182
                              const std::map<std::string,
183 183
                                             typename Graph::Edge>& map)
184 184
        : _graph(graph), _map(map) {}
185 185

	
186 186
      typename Graph::Arc operator()(const std::string& str) {
187 187
        if (str.empty() || (str[0] != '+' && str[0] != '-')) {
188 188
          throw FormatError("Item must start with '+' or '-'");
189 189
        }
190 190
        typename std::map<std::string, typename Graph::Edge>
191 191
          ::const_iterator it = _map.find(str.substr(1));
192 192
        if (it == _map.end()) {
193 193
          throw FormatError("Item not found");
194 194
        }
195 195
        return _graph.direct(it->second, str[0] == '+');
196 196
      }
197 197
    };
... ...
@@ -776,384 +776,391 @@
776 776
      for (ArcIt a(_digraph); a != INVALID; ++a) {
777 777
        _arc_index.insert(std::make_pair(converter(map[a]), a));
778 778
      }
779 779
      return *this;
780 780
    }
781 781

	
782 782
    /// \brief Use previously constructed arc set
783 783
    ///
784 784
    /// Use previously constructed arc set, and specify the arc
785 785
    /// label map and a functor which converts the label map values to
786 786
    /// \c std::string.
787 787
    template <typename Map, typename Converter>
788 788
    DigraphReader& useArcs(const Map& map,
789 789
                           const Converter& converter = Converter()) {
790 790
      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
791 791
      LEMON_ASSERT(!_use_arcs, "Multiple usage of useArcs() member");
792 792
      _use_arcs = true;
793 793
      for (ArcIt a(_digraph); a != INVALID; ++a) {
794 794
        _arc_index.insert(std::make_pair(converter(map[a]), a));
795 795
      }
796 796
      return *this;
797 797
    }
798 798

	
799 799
    /// \brief Skips the reading of node section
800 800
    ///
801 801
    /// Omit the reading of the node section. This implies that each node
802 802
    /// map reading rule will be abandoned, and the nodes of the graph
803 803
    /// will not be constructed, which usually cause that the arc set
804 804
    /// could not be read due to lack of node name resolving.
805 805
    /// Therefore \c skipArcs() function should also be used, or
806 806
    /// \c useNodes() should be used to specify the label of the nodes.
807 807
    DigraphReader& skipNodes() {
808 808
      LEMON_ASSERT(!_skip_nodes, "Skip nodes already set");
809 809
      _skip_nodes = true;
810 810
      return *this;
811 811
    }
812 812

	
813 813
    /// \brief Skips the reading of arc section
814 814
    ///
815 815
    /// Omit the reading of the arc section. This implies that each arc
816 816
    /// map reading rule will be abandoned, and the arcs of the graph
817 817
    /// will not be constructed.
818 818
    DigraphReader& skipArcs() {
819 819
      LEMON_ASSERT(!_skip_arcs, "Skip arcs already set");
820 820
      _skip_arcs = true;
821 821
      return *this;
822 822
    }
823 823

	
824 824
    /// @}
825 825

	
826 826
  private:
827 827

	
828 828
    bool readLine() {
829 829
      std::string str;
830 830
      while(++line_num, std::getline(*_is, str)) {
831 831
        line.clear(); line.str(str);
832 832
        char c;
833 833
        if (line >> std::ws >> c && c != '#') {
834 834
          line.putback(c);
835 835
          return true;
836 836
        }
837 837
      }
838 838
      return false;
839 839
    }
840 840

	
841 841
    bool readSuccess() {
842 842
      return static_cast<bool>(*_is);
843 843
    }
844 844

	
845 845
    void skipSection() {
846 846
      char c;
847 847
      while (readSuccess() && line >> c && c != '@') {
848 848
        readLine();
849 849
      }
850 850
      if (readSuccess()) {
851 851
        line.putback(c);
852 852
      }
853 853
    }
854 854

	
855 855
    void readNodes() {
856 856

	
857 857
      std::vector<int> map_index(_node_maps.size());
858 858
      int map_num, label_index;
859 859

	
860 860
      char c;
861 861
      if (!readLine() || !(line >> c) || c == '@') {
862 862
        if (readSuccess() && line) line.putback(c);
863 863
        if (!_node_maps.empty())
864 864
          throw FormatError("Cannot find map names");
865 865
        return;
866 866
      }
867 867
      line.putback(c);
868 868

	
869 869
      {
870 870
        std::map<std::string, int> maps;
871 871

	
872 872
        std::string map;
873 873
        int index = 0;
874 874
        while (_reader_bits::readToken(line, map)) {
875 875
          if (maps.find(map) != maps.end()) {
876 876
            std::ostringstream msg;
877 877
            msg << "Multiple occurence of node map: " << map;
878 878
            throw FormatError(msg.str());
879 879
          }
880 880
          maps.insert(std::make_pair(map, index));
881 881
          ++index;
882 882
        }
883 883

	
884 884
        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
885 885
          std::map<std::string, int>::iterator jt =
886 886
            maps.find(_node_maps[i].first);
887 887
          if (jt == maps.end()) {
888 888
            std::ostringstream msg;
889 889
            msg << "Map not found: " << _node_maps[i].first;
890 890
            throw FormatError(msg.str());
891 891
          }
892 892
          map_index[i] = jt->second;
893 893
        }
894 894

	
895 895
        {
896 896
          std::map<std::string, int>::iterator jt = maps.find("label");
897 897
          if (jt != maps.end()) {
898 898
            label_index = jt->second;
899 899
          } else {
900 900
            label_index = -1;
901 901
          }
902 902
        }
903 903
        map_num = maps.size();
904 904
      }
905 905

	
906 906
      while (readLine() && line >> c && c != '@') {
907 907
        line.putback(c);
908 908

	
909 909
        std::vector<std::string> tokens(map_num);
910 910
        for (int i = 0; i < map_num; ++i) {
911 911
          if (!_reader_bits::readToken(line, tokens[i])) {
912 912
            std::ostringstream msg;
913 913
            msg << "Column not found (" << i + 1 << ")";
914 914
            throw FormatError(msg.str());
915 915
          }
916 916
        }
917 917
        if (line >> std::ws >> c)
918 918
          throw FormatError("Extra character at the end of line");
919 919

	
920 920
        Node n;
921 921
        if (!_use_nodes) {
922 922
          n = _digraph.addNode();
923 923
          if (label_index != -1)
924 924
            _node_index.insert(std::make_pair(tokens[label_index], n));
925 925
        } else {
926 926
          if (label_index == -1)
927 927
            throw FormatError("Label map not found");
928 928
          typename std::map<std::string, Node>::iterator it =
929 929
            _node_index.find(tokens[label_index]);
930 930
          if (it == _node_index.end()) {
931 931
            std::ostringstream msg;
932 932
            msg << "Node with label not found: " << tokens[label_index];
933 933
            throw FormatError(msg.str());
934 934
          }
935 935
          n = it->second;
936 936
        }
937 937

	
938 938
        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
939 939
          _node_maps[i].second->set(n, tokens[map_index[i]]);
940 940
        }
941 941

	
942 942
      }
943 943
      if (readSuccess()) {
944 944
        line.putback(c);
945 945
      }
946 946
    }
947 947

	
948 948
    void readArcs() {
949 949

	
950 950
      std::vector<int> map_index(_arc_maps.size());
951 951
      int map_num, label_index;
952 952

	
953 953
      char c;
954 954
      if (!readLine() || !(line >> c) || c == '@') {
955 955
        if (readSuccess() && line) line.putback(c);
956 956
        if (!_arc_maps.empty())
957 957
          throw FormatError("Cannot find map names");
958 958
        return;
959 959
      }
960 960
      line.putback(c);
961 961

	
962 962
      {
963 963
        std::map<std::string, int> maps;
964 964

	
965 965
        std::string map;
966 966
        int index = 0;
967 967
        while (_reader_bits::readToken(line, map)) {
968
          if(map == "-") {
969
              if(index!=0)
970
                throw FormatError("'-' is not allowed as a map name");
971
              else if (line >> std::ws >> c)
972
                throw FormatError("Extra character at the end of line");
973
              else break;
974
            }
968 975
          if (maps.find(map) != maps.end()) {
969 976
            std::ostringstream msg;
970 977
            msg << "Multiple occurence of arc map: " << map;
971 978
            throw FormatError(msg.str());
972 979
          }
973 980
          maps.insert(std::make_pair(map, index));
974 981
          ++index;
975 982
        }
976 983

	
977 984
        for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
978 985
          std::map<std::string, int>::iterator jt =
979 986
            maps.find(_arc_maps[i].first);
980 987
          if (jt == maps.end()) {
981 988
            std::ostringstream msg;
982 989
            msg << "Map not found: " << _arc_maps[i].first;
983 990
            throw FormatError(msg.str());
984 991
          }
985 992
          map_index[i] = jt->second;
986 993
        }
987 994

	
988 995
        {
989 996
          std::map<std::string, int>::iterator jt = maps.find("label");
990 997
          if (jt != maps.end()) {
991 998
            label_index = jt->second;
992 999
          } else {
993 1000
            label_index = -1;
994 1001
          }
995 1002
        }
996 1003
        map_num = maps.size();
997 1004
      }
998 1005

	
999 1006
      while (readLine() && line >> c && c != '@') {
1000 1007
        line.putback(c);
1001 1008

	
1002 1009
        std::string source_token;
1003 1010
        std::string target_token;
1004 1011

	
1005 1012
        if (!_reader_bits::readToken(line, source_token))
1006 1013
          throw FormatError("Source not found");
1007 1014

	
1008 1015
        if (!_reader_bits::readToken(line, target_token))
1009 1016
          throw FormatError("Target not found");
1010 1017

	
1011 1018
        std::vector<std::string> tokens(map_num);
1012 1019
        for (int i = 0; i < map_num; ++i) {
1013 1020
          if (!_reader_bits::readToken(line, tokens[i])) {
1014 1021
            std::ostringstream msg;
1015 1022
            msg << "Column not found (" << i + 1 << ")";
1016 1023
            throw FormatError(msg.str());
1017 1024
          }
1018 1025
        }
1019 1026
        if (line >> std::ws >> c)
1020 1027
          throw FormatError("Extra character at the end of line");
1021 1028

	
1022 1029
        Arc a;
1023 1030
        if (!_use_arcs) {
1024 1031

	
1025 1032
          typename NodeIndex::iterator it;
1026 1033

	
1027 1034
          it = _node_index.find(source_token);
1028 1035
          if (it == _node_index.end()) {
1029 1036
            std::ostringstream msg;
1030 1037
            msg << "Item not found: " << source_token;
1031 1038
            throw FormatError(msg.str());
1032 1039
          }
1033 1040
          Node source = it->second;
1034 1041

	
1035 1042
          it = _node_index.find(target_token);
1036 1043
          if (it == _node_index.end()) {
1037 1044
            std::ostringstream msg;
1038 1045
            msg << "Item not found: " << target_token;
1039 1046
            throw FormatError(msg.str());
1040 1047
          }
1041 1048
          Node target = it->second;
1042 1049

	
1043 1050
          a = _digraph.addArc(source, target);
1044 1051
          if (label_index != -1)
1045 1052
            _arc_index.insert(std::make_pair(tokens[label_index], a));
1046 1053
        } else {
1047 1054
          if (label_index == -1)
1048 1055
            throw FormatError("Label map not found");
1049 1056
          typename std::map<std::string, Arc>::iterator it =
1050 1057
            _arc_index.find(tokens[label_index]);
1051 1058
          if (it == _arc_index.end()) {
1052 1059
            std::ostringstream msg;
1053 1060
            msg << "Arc with label not found: " << tokens[label_index];
1054 1061
            throw FormatError(msg.str());
1055 1062
          }
1056 1063
          a = it->second;
1057 1064
        }
1058 1065

	
1059 1066
        for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
1060 1067
          _arc_maps[i].second->set(a, tokens[map_index[i]]);
1061 1068
        }
1062 1069

	
1063 1070
      }
1064 1071
      if (readSuccess()) {
1065 1072
        line.putback(c);
1066 1073
      }
1067 1074
    }
1068 1075

	
1069 1076
    void readAttributes() {
1070 1077

	
1071 1078
      std::set<std::string> read_attr;
1072 1079

	
1073 1080
      char c;
1074 1081
      while (readLine() && line >> c && c != '@') {
1075 1082
        line.putback(c);
1076 1083

	
1077 1084
        std::string attr, token;
1078 1085
        if (!_reader_bits::readToken(line, attr))
1079 1086
          throw FormatError("Attribute name not found");
1080 1087
        if (!_reader_bits::readToken(line, token))
1081 1088
          throw FormatError("Attribute value not found");
1082 1089
        if (line >> c)
1083 1090
          throw FormatError("Extra character at the end of line");
1084 1091

	
1085 1092
        {
1086 1093
          std::set<std::string>::iterator it = read_attr.find(attr);
1087 1094
          if (it != read_attr.end()) {
1088 1095
            std::ostringstream msg;
1089 1096
            msg << "Multiple occurence of attribute: " << attr;
1090 1097
            throw FormatError(msg.str());
1091 1098
          }
1092 1099
          read_attr.insert(attr);
1093 1100
        }
1094 1101

	
1095 1102
        {
1096 1103
          typename Attributes::iterator it = _attributes.lower_bound(attr);
1097 1104
          while (it != _attributes.end() && it->first == attr) {
1098 1105
            it->second->set(token);
1099 1106
            ++it;
1100 1107
          }
1101 1108
        }
1102 1109

	
1103 1110
      }
1104 1111
      if (readSuccess()) {
1105 1112
        line.putback(c);
1106 1113
      }
1107 1114
      for (typename Attributes::iterator it = _attributes.begin();
1108 1115
           it != _attributes.end(); ++it) {
1109 1116
        if (read_attr.find(it->first) == read_attr.end()) {
1110 1117
          std::ostringstream msg;
1111 1118
          msg << "Attribute not found: " << it->first;
1112 1119
          throw FormatError(msg.str());
1113 1120
        }
1114 1121
      }
1115 1122
    }
1116 1123

	
1117 1124
  public:
1118 1125

	
1119 1126
    /// \name Execution of the reader
1120 1127
    /// @{
1121 1128

	
1122 1129
    /// \brief Start the batch processing
1123 1130
    ///
1124 1131
    /// This function starts the batch processing
1125 1132
    void run() {
1126 1133
      LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
1127 1134

	
1128 1135
      bool nodes_done = _skip_nodes;
1129 1136
      bool arcs_done = _skip_arcs;
1130 1137
      bool attributes_done = false;
1131 1138

	
1132 1139
      line_num = 0;
1133 1140
      readLine();
1134 1141
      skipSection();
1135 1142

	
1136 1143
      while (readSuccess()) {
1137 1144
        try {
1138 1145
          char c;
1139 1146
          std::string section, caption;
1140 1147
          line >> c;
1141 1148
          _reader_bits::readToken(line, section);
1142 1149
          _reader_bits::readToken(line, caption);
1143 1150

	
1144 1151
          if (line >> c)
1145 1152
            throw FormatError("Extra character at the end of line");
1146 1153

	
1147 1154
          if (section == "nodes" && !nodes_done) {
1148 1155
            if (_nodes_caption.empty() || _nodes_caption == caption) {
1149 1156
              readNodes();
1150 1157
              nodes_done = true;
1151 1158
            }
1152 1159
          } else if ((section == "arcs" || section == "edges") &&
1153 1160
                     !arcs_done) {
1154 1161
            if (_arcs_caption.empty() || _arcs_caption == caption) {
1155 1162
              readArcs();
1156 1163
              arcs_done = true;
1157 1164
            }
1158 1165
          } else if (section == "attributes" && !attributes_done) {
1159 1166
            if (_attributes_caption.empty() || _attributes_caption == caption) {
... ...
@@ -1618,384 +1625,391 @@
1618 1625
        _edge_index.insert(std::make_pair(converter(map[a]), a));
1619 1626
      }
1620 1627
      return *this;
1621 1628
    }
1622 1629

	
1623 1630
    /// \brief Use previously constructed edge set
1624 1631
    ///
1625 1632
    /// Use previously constructed edge set, and specify the edge
1626 1633
    /// label map and a functor which converts the label map values to
1627 1634
    /// \c std::string.
1628 1635
    template <typename Map, typename Converter>
1629 1636
    GraphReader& useEdges(const Map& map,
1630 1637
                            const Converter& converter = Converter()) {
1631 1638
      checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
1632 1639
      LEMON_ASSERT(!_use_edges, "Multiple usage of useEdges() member");
1633 1640
      _use_edges = true;
1634 1641
      for (EdgeIt a(_graph); a != INVALID; ++a) {
1635 1642
        _edge_index.insert(std::make_pair(converter(map[a]), a));
1636 1643
      }
1637 1644
      return *this;
1638 1645
    }
1639 1646

	
1640 1647
    /// \brief Skip the reading of node section
1641 1648
    ///
1642 1649
    /// Omit the reading of the node section. This implies that each node
1643 1650
    /// map reading rule will be abandoned, and the nodes of the graph
1644 1651
    /// will not be constructed, which usually cause that the edge set
1645 1652
    /// could not be read due to lack of node name
1646 1653
    /// could not be read due to lack of node name resolving.
1647 1654
    /// Therefore \c skipEdges() function should also be used, or
1648 1655
    /// \c useNodes() should be used to specify the label of the nodes.
1649 1656
    GraphReader& skipNodes() {
1650 1657
      LEMON_ASSERT(!_skip_nodes, "Skip nodes already set");
1651 1658
      _skip_nodes = true;
1652 1659
      return *this;
1653 1660
    }
1654 1661

	
1655 1662
    /// \brief Skip the reading of edge section
1656 1663
    ///
1657 1664
    /// Omit the reading of the edge section. This implies that each edge
1658 1665
    /// map reading rule will be abandoned, and the edges of the graph
1659 1666
    /// will not be constructed.
1660 1667
    GraphReader& skipEdges() {
1661 1668
      LEMON_ASSERT(!_skip_edges, "Skip edges already set");
1662 1669
      _skip_edges = true;
1663 1670
      return *this;
1664 1671
    }
1665 1672

	
1666 1673
    /// @}
1667 1674

	
1668 1675
  private:
1669 1676

	
1670 1677
    bool readLine() {
1671 1678
      std::string str;
1672 1679
      while(++line_num, std::getline(*_is, str)) {
1673 1680
        line.clear(); line.str(str);
1674 1681
        char c;
1675 1682
        if (line >> std::ws >> c && c != '#') {
1676 1683
          line.putback(c);
1677 1684
          return true;
1678 1685
        }
1679 1686
      }
1680 1687
      return false;
1681 1688
    }
1682 1689

	
1683 1690
    bool readSuccess() {
1684 1691
      return static_cast<bool>(*_is);
1685 1692
    }
1686 1693

	
1687 1694
    void skipSection() {
1688 1695
      char c;
1689 1696
      while (readSuccess() && line >> c && c != '@') {
1690 1697
        readLine();
1691 1698
      }
1692 1699
      if (readSuccess()) {
1693 1700
        line.putback(c);
1694 1701
      }
1695 1702
    }
1696 1703

	
1697 1704
    void readNodes() {
1698 1705

	
1699 1706
      std::vector<int> map_index(_node_maps.size());
1700 1707
      int map_num, label_index;
1701 1708

	
1702 1709
      char c;
1703 1710
      if (!readLine() || !(line >> c) || c == '@') {
1704 1711
        if (readSuccess() && line) line.putback(c);
1705 1712
        if (!_node_maps.empty())
1706 1713
          throw FormatError("Cannot find map names");
1707 1714
        return;
1708 1715
      }
1709 1716
      line.putback(c);
1710 1717

	
1711 1718
      {
1712 1719
        std::map<std::string, int> maps;
1713 1720

	
1714 1721
        std::string map;
1715 1722
        int index = 0;
1716 1723
        while (_reader_bits::readToken(line, map)) {
1717 1724
          if (maps.find(map) != maps.end()) {
1718 1725
            std::ostringstream msg;
1719 1726
            msg << "Multiple occurence of node map: " << map;
1720 1727
            throw FormatError(msg.str());
1721 1728
          }
1722 1729
          maps.insert(std::make_pair(map, index));
1723 1730
          ++index;
1724 1731
        }
1725 1732

	
1726 1733
        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
1727 1734
          std::map<std::string, int>::iterator jt =
1728 1735
            maps.find(_node_maps[i].first);
1729 1736
          if (jt == maps.end()) {
1730 1737
            std::ostringstream msg;
1731 1738
            msg << "Map not found: " << _node_maps[i].first;
1732 1739
            throw FormatError(msg.str());
1733 1740
          }
1734 1741
          map_index[i] = jt->second;
1735 1742
        }
1736 1743

	
1737 1744
        {
1738 1745
          std::map<std::string, int>::iterator jt = maps.find("label");
1739 1746
          if (jt != maps.end()) {
1740 1747
            label_index = jt->second;
1741 1748
          } else {
1742 1749
            label_index = -1;
1743 1750
          }
1744 1751
        }
1745 1752
        map_num = maps.size();
1746 1753
      }
1747 1754

	
1748 1755
      while (readLine() && line >> c && c != '@') {
1749 1756
        line.putback(c);
1750 1757

	
1751 1758
        std::vector<std::string> tokens(map_num);
1752 1759
        for (int i = 0; i < map_num; ++i) {
1753 1760
          if (!_reader_bits::readToken(line, tokens[i])) {
1754 1761
            std::ostringstream msg;
1755 1762
            msg << "Column not found (" << i + 1 << ")";
1756 1763
            throw FormatError(msg.str());
1757 1764
          }
1758 1765
        }
1759 1766
        if (line >> std::ws >> c)
1760 1767
          throw FormatError("Extra character at the end of line");
1761 1768

	
1762 1769
        Node n;
1763 1770
        if (!_use_nodes) {
1764 1771
          n = _graph.addNode();
1765 1772
          if (label_index != -1)
1766 1773
            _node_index.insert(std::make_pair(tokens[label_index], n));
1767 1774
        } else {
1768 1775
          if (label_index == -1)
1769 1776
            throw FormatError("Label map not found");
1770 1777
          typename std::map<std::string, Node>::iterator it =
1771 1778
            _node_index.find(tokens[label_index]);
1772 1779
          if (it == _node_index.end()) {
1773 1780
            std::ostringstream msg;
1774 1781
            msg << "Node with label not found: " << tokens[label_index];
1775 1782
            throw FormatError(msg.str());
1776 1783
          }
1777 1784
          n = it->second;
1778 1785
        }
1779 1786

	
1780 1787
        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
1781 1788
          _node_maps[i].second->set(n, tokens[map_index[i]]);
1782 1789
        }
1783 1790

	
1784 1791
      }
1785 1792
      if (readSuccess()) {
1786 1793
        line.putback(c);
1787 1794
      }
1788 1795
    }
1789 1796

	
1790 1797
    void readEdges() {
1791 1798

	
1792 1799
      std::vector<int> map_index(_edge_maps.size());
1793 1800
      int map_num, label_index;
1794 1801

	
1795 1802
      char c;
1796 1803
      if (!readLine() || !(line >> c) || c == '@') {
1797 1804
        if (readSuccess() && line) line.putback(c);
1798 1805
        if (!_edge_maps.empty())
1799 1806
          throw FormatError("Cannot find map names");
1800 1807
        return;
1801 1808
      }
1802 1809
      line.putback(c);
1803 1810

	
1804 1811
      {
1805 1812
        std::map<std::string, int> maps;
1806 1813

	
1807 1814
        std::string map;
1808 1815
        int index = 0;
1809 1816
        while (_reader_bits::readToken(line, map)) {
1817
          if(map == "-") {
1818
              if(index!=0)
1819
                throw FormatError("'-' is not allowed as a map name");
1820
              else if (line >> std::ws >> c)
1821
                throw FormatError("Extra character at the end of line");
1822
              else break;
1823
            }
1810 1824
          if (maps.find(map) != maps.end()) {
1811 1825
            std::ostringstream msg;
1812 1826
            msg << "Multiple occurence of edge map: " << map;
1813 1827
            throw FormatError(msg.str());
1814 1828
          }
1815 1829
          maps.insert(std::make_pair(map, index));
1816 1830
          ++index;
1817 1831
        }
1818 1832

	
1819 1833
        for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
1820 1834
          std::map<std::string, int>::iterator jt =
1821 1835
            maps.find(_edge_maps[i].first);
1822 1836
          if (jt == maps.end()) {
1823 1837
            std::ostringstream msg;
1824 1838
            msg << "Map not found: " << _edge_maps[i].first;
1825 1839
            throw FormatError(msg.str());
1826 1840
          }
1827 1841
          map_index[i] = jt->second;
1828 1842
        }
1829 1843

	
1830 1844
        {
1831 1845
          std::map<std::string, int>::iterator jt = maps.find("label");
1832 1846
          if (jt != maps.end()) {
1833 1847
            label_index = jt->second;
1834 1848
          } else {
1835 1849
            label_index = -1;
1836 1850
          }
1837 1851
        }
1838 1852
        map_num = maps.size();
1839 1853
      }
1840 1854

	
1841 1855
      while (readLine() && line >> c && c != '@') {
1842 1856
        line.putback(c);
1843 1857

	
1844 1858
        std::string source_token;
1845 1859
        std::string target_token;
1846 1860

	
1847 1861
        if (!_reader_bits::readToken(line, source_token))
1848 1862
          throw FormatError("Node u not found");
1849 1863

	
1850 1864
        if (!_reader_bits::readToken(line, target_token))
1851 1865
          throw FormatError("Node v not found");
1852 1866

	
1853 1867
        std::vector<std::string> tokens(map_num);
1854 1868
        for (int i = 0; i < map_num; ++i) {
1855 1869
          if (!_reader_bits::readToken(line, tokens[i])) {
1856 1870
            std::ostringstream msg;
1857 1871
            msg << "Column not found (" << i + 1 << ")";
1858 1872
            throw FormatError(msg.str());
1859 1873
          }
1860 1874
        }
1861 1875
        if (line >> std::ws >> c)
1862 1876
          throw FormatError("Extra character at the end of line");
1863 1877

	
1864 1878
        Edge e;
1865 1879
        if (!_use_edges) {
1866 1880

	
1867 1881
          typename NodeIndex::iterator it;
1868 1882

	
1869 1883
          it = _node_index.find(source_token);
1870 1884
          if (it == _node_index.end()) {
1871 1885
            std::ostringstream msg;
1872 1886
            msg << "Item not found: " << source_token;
1873 1887
            throw FormatError(msg.str());
1874 1888
          }
1875 1889
          Node source = it->second;
1876 1890

	
1877 1891
          it = _node_index.find(target_token);
1878 1892
          if (it == _node_index.end()) {
1879 1893
            std::ostringstream msg;
1880 1894
            msg << "Item not found: " << target_token;
1881 1895
            throw FormatError(msg.str());
1882 1896
          }
1883 1897
          Node target = it->second;
1884 1898

	
1885 1899
          e = _graph.addEdge(source, target);
1886 1900
          if (label_index != -1)
1887 1901
            _edge_index.insert(std::make_pair(tokens[label_index], e));
1888 1902
        } else {
1889 1903
          if (label_index == -1)
1890 1904
            throw FormatError("Label map not found");
1891 1905
          typename std::map<std::string, Edge>::iterator it =
1892 1906
            _edge_index.find(tokens[label_index]);
1893 1907
          if (it == _edge_index.end()) {
1894 1908
            std::ostringstream msg;
1895 1909
            msg << "Edge with label not found: " << tokens[label_index];
1896 1910
            throw FormatError(msg.str());
1897 1911
          }
1898 1912
          e = it->second;
1899 1913
        }
1900 1914

	
1901 1915
        for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
1902 1916
          _edge_maps[i].second->set(e, tokens[map_index[i]]);
1903 1917
        }
1904 1918

	
1905 1919
      }
1906 1920
      if (readSuccess()) {
1907 1921
        line.putback(c);
1908 1922
      }
1909 1923
    }
1910 1924

	
1911 1925
    void readAttributes() {
1912 1926

	
1913 1927
      std::set<std::string> read_attr;
1914 1928

	
1915 1929
      char c;
1916 1930
      while (readLine() && line >> c && c != '@') {
1917 1931
        line.putback(c);
1918 1932

	
1919 1933
        std::string attr, token;
1920 1934
        if (!_reader_bits::readToken(line, attr))
1921 1935
          throw FormatError("Attribute name not found");
1922 1936
        if (!_reader_bits::readToken(line, token))
1923 1937
          throw FormatError("Attribute value not found");
1924 1938
        if (line >> c)
1925 1939
          throw FormatError("Extra character at the end of line");
1926 1940

	
1927 1941
        {
1928 1942
          std::set<std::string>::iterator it = read_attr.find(attr);
1929 1943
          if (it != read_attr.end()) {
1930 1944
            std::ostringstream msg;
1931 1945
            msg << "Multiple occurence of attribute: " << attr;
1932 1946
            throw FormatError(msg.str());
1933 1947
          }
1934 1948
          read_attr.insert(attr);
1935 1949
        }
1936 1950

	
1937 1951
        {
1938 1952
          typename Attributes::iterator it = _attributes.lower_bound(attr);
1939 1953
          while (it != _attributes.end() && it->first == attr) {
1940 1954
            it->second->set(token);
1941 1955
            ++it;
1942 1956
          }
1943 1957
        }
1944 1958

	
1945 1959
      }
1946 1960
      if (readSuccess()) {
1947 1961
        line.putback(c);
1948 1962
      }
1949 1963
      for (typename Attributes::iterator it = _attributes.begin();
1950 1964
           it != _attributes.end(); ++it) {
1951 1965
        if (read_attr.find(it->first) == read_attr.end()) {
1952 1966
          std::ostringstream msg;
1953 1967
          msg << "Attribute not found: " << it->first;
1954 1968
          throw FormatError(msg.str());
1955 1969
        }
1956 1970
      }
1957 1971
    }
1958 1972

	
1959 1973
  public:
1960 1974

	
1961 1975
    /// \name Execution of the reader
1962 1976
    /// @{
1963 1977

	
1964 1978
    /// \brief Start the batch processing
1965 1979
    ///
1966 1980
    /// This function starts the batch processing
1967 1981
    void run() {
1968 1982

	
1969 1983
      LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
1970 1984

	
1971 1985
      bool nodes_done = _skip_nodes;
1972 1986
      bool edges_done = _skip_edges;
1973 1987
      bool attributes_done = false;
1974 1988

	
1975 1989
      line_num = 0;
1976 1990
      readLine();
1977 1991
      skipSection();
1978 1992

	
1979 1993
      while (readSuccess()) {
1980 1994
        try {
1981 1995
          char c;
1982 1996
          std::string section, caption;
1983 1997
          line >> c;
1984 1998
          _reader_bits::readToken(line, section);
1985 1999
          _reader_bits::readToken(line, caption);
1986 2000

	
1987 2001
          if (line >> c)
1988 2002
            throw FormatError("Extra character at the end of line");
1989 2003

	
1990 2004
          if (section == "nodes" && !nodes_done) {
1991 2005
            if (_nodes_caption.empty() || _nodes_caption == caption) {
1992 2006
              readNodes();
1993 2007
              nodes_done = true;
1994 2008
            }
1995 2009
          } else if ((section == "edges" || section == "arcs") &&
1996 2010
                     !edges_done) {
1997 2011
            if (_edges_caption.empty() || _edges_caption == caption) {
1998 2012
              readEdges();
1999 2013
              edges_done = true;
2000 2014
            }
2001 2015
          } else if (section == "attributes" && !attributes_done) {
Ignore white space 384 line context
1 1
INCLUDE_DIRECTORIES(
2 2
  ${CMAKE_SOURCE_DIR}
3 3
  ${PROJECT_BINARY_DIR}
4 4
)
5 5

	
6 6
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
7 7

	
8 8
SET(TESTS
9 9
  bfs_test
10 10
  counter_test
11 11
  dfs_test
12 12
  digraph_test
13 13
  dijkstra_test
14 14
  dim_test
15 15
  error_test
16 16
  graph_copy_test
17 17
  graph_test
18 18
  graph_utils_test
19 19
  heap_test
20 20
  kruskal_test
21
  lgf_test
21 22
  maps_test
22 23
  random_test
23 24
  path_test
24 25
  time_measure_test
25 26
  unionfind_test)
26 27

	
27 28
FOREACH(TEST_NAME ${TESTS})
28 29
  ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)
29 30
  TARGET_LINK_LIBRARIES(${TEST_NAME} lemon)
30 31
  ADD_TEST(${TEST_NAME} ${TEST_NAME})
31 32
ENDFOREACH(TEST_NAME)
Ignore white space 6 line context
1 1
EXTRA_DIST += \
2 2
	test/CMakeLists.txt
3 3

	
4 4
noinst_HEADERS += \
5 5
	test/graph_test.h \
6 6
        test/test_tools.h
7 7

	
8 8
check_PROGRAMS += \
9 9
	test/bfs_test \
10 10
        test/counter_test \
11 11
	test/dfs_test \
12 12
	test/digraph_test \
13 13
	test/dijkstra_test \
14 14
        test/dim_test \
15 15
	test/error_test \
16 16
	test/graph_copy_test \
17 17
	test/graph_test \
18 18
	test/graph_utils_test \
19 19
	test/heap_test \
20 20
	test/kruskal_test \
21
	test/lgf_test \
21 22
        test/maps_test \
22 23
        test/random_test \
23 24
        test/path_test \
24 25
        test/test_tools_fail \
25 26
        test/test_tools_pass \
26 27
        test/time_measure_test \
27 28
	test/unionfind_test
28 29

	
29 30
TESTS += $(check_PROGRAMS)
30 31
XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
31 32

	
32 33
test_bfs_test_SOURCES = test/bfs_test.cc
33 34
test_counter_test_SOURCES = test/counter_test.cc
34 35
test_dfs_test_SOURCES = test/dfs_test.cc
35 36
test_digraph_test_SOURCES = test/digraph_test.cc
36 37
test_dijkstra_test_SOURCES = test/dijkstra_test.cc
37 38
test_dim_test_SOURCES = test/dim_test.cc
38 39
test_error_test_SOURCES = test/error_test.cc
39 40
test_graph_copy_test_SOURCES = test/graph_copy_test.cc
40 41
test_graph_test_SOURCES = test/graph_test.cc
41 42
test_graph_utils_test_SOURCES = test/graph_utils_test.cc
42 43
test_heap_test_SOURCES = test/heap_test.cc
43 44
test_kruskal_test_SOURCES = test/kruskal_test.cc
45
test_lgf_test_SOURCES = test/lgf_test.cc
44 46
test_maps_test_SOURCES = test/maps_test.cc
45 47
test_path_test_SOURCES = test/path_test.cc
46 48
test_random_test_SOURCES = test/random_test.cc
47 49
test_test_tools_fail_SOURCES = test/test_tools_fail.cc
48 50
test_test_tools_pass_SOURCES = test/test_tools_pass.cc
49 51
test_time_measure_test_SOURCES = test/time_measure_test.cc
50 52
test_unionfind_test_SOURCES = test/unionfind_test.cc
0 comments (0 inline)