LEMON/LEMON-official Changeset - r1070:c8c8801db0a4

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r1070:c8c8801db0a4

« 1067:544645
« 1065:b52238

1075:ece3d4 »

r1070:c8c8801db0a4

Thu, 04 Aug 2011 21:33:17

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge #382 to branch 1.2

0 4 1

merge 1.2

4 files changed with 205 insertions and 8 deletions:

test/lgf_test.cc

169

doc/lgf.dox

lemon/lgf_reader.h

test/CMakeLists.txt

test/Makefile.am

↑ Collapse diff ↑

test/lgf_test.cc

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2011
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#include <lemon/list_graph.h>
 		#include <lemon/lgf_reader.h>
 		#include "test_tools.h"
 		using namespace lemon;
 		char test_lgf[] =
 		  "@nodes\n"
 		  "label\n"
 		  "0\n"
 		  "1\n"
 		  "@arcs\n"
 		  "     label\n"
 		  "0 1  0\n"
 		  "1 0  1\n"
 		  "@attributes\n"
 		  "source 0\n"
 		  "target 1\n";
 		char test_lgf_nomap[] =
 		  "@nodes\n"
 		  "label\n"
 		  "0\n"
 		  "1\n"
 		  "@arcs\n"
 		  "     -\n"
 		  "0 1\n";
 		char test_lgf_bad1[] =
 		  "@nodes\n"
 		  "label\n"
 		  "0\n"
 		  "1\n"
 		  "@arcs\n"
 		  "     - another\n"
 		  "0 1\n";
 		char test_lgf_bad2[] =
 		  "@nodes\n"
 		  "label\n"
 		  "0\n"
 		  "1\n"
 		  "@arcs\n"
 		  "     label -\n"
 		  "0 1\n";
 		int main()
+		{
+		  {
 		    ListDigraph d;
 		    ListDigraph::Node s,t;
 		    ListDigraph::ArcMap<int> label(d);
 		    std::istringstream input(test_lgf);
 		    digraphReader(d, input).
 		      node("source", s).
 		      node("target", t).
 		      arcMap("label", label).
 		      run();
 		    check(countNodes(d) == 2,"There should be 2 nodes");
 		    check(countArcs(d) == 2,"There should be 2 arcs");
+		  }
+		  {
 		    ListGraph g;
 		    ListGraph::Node s,t;
 		    ListGraph::EdgeMap<int> label(g);
 		    std::istringstream input(test_lgf);
 		    graphReader(g, input).
 		      node("source", s).
 		      node("target", t).
 		      edgeMap("label", label).
 		      run();
 		    check(countNodes(g) == 2,"There should be 2 nodes");
 		    check(countEdges(g) == 2,"There should be 2 arcs");
+		  }
+		  {
 		    ListDigraph d;
 		    std::istringstream input(test_lgf_nomap);
 		    digraphReader(d, input).
 		      run();
 		    check(countNodes(d) == 2,"There should be 2 nodes");
 		    check(countArcs(d) == 1,"There should be 1 arc");
+		  }
+		  {
 		    ListGraph g;
 		    std::istringstream input(test_lgf_nomap);
 		    graphReader(g, input).
 		      run();
 		    check(countNodes(g) == 2,"There should be 2 nodes");
 		    check(countEdges(g) == 1,"There should be 1 edge");
+		  }
+		  {
 		    ListDigraph d;
 		    std::istringstream input(test_lgf_bad1);
 		    bool ok=false;
 		    try {
 		      digraphReader(d, input).
 		        run();
+		    }
 		    catch (FormatError& error)
+		      {
 		        ok = true;
+		      }
 		    check(ok,"FormatError exception should have occured");
+		  }
+		  {
 		    ListGraph g;
 		    std::istringstream input(test_lgf_bad1);
 		    bool ok=false;
 		    try {
 		      graphReader(g, input).
 		        run();
+		    }
 		    catch (FormatError& error)
+		      {
 		        ok = true;
+		      }
 		    check(ok,"FormatError exception should have occured");
+		  }
+		  {
 		    ListDigraph d;
 		    std::istringstream input(test_lgf_bad2);
 		    bool ok=false;
 		    try {
 		      digraphReader(d, input).
 		        run();
+		    }
 		    catch (FormatError& error)
+		      {
 		        ok = true;
+		      }
 		    check(ok,"FormatError exception should have occured");
+		  }
+		  {
 		    ListGraph g;
 		    std::istringstream input(test_lgf_bad2);
 		    bool ok=false;
 		    try {
 		      graphReader(g, input).
 		        run();
+		    }
 		    catch (FormatError& error)
+		      {
 		        ok = true;
+		      }
 		    check(ok,"FormatError exception should have occured");
+		  }
+		}

doc/lgf.dox

Show inline comments

@@ -34,74 +34,85 @@
 		a header line. The header lines starts with an \c '@' character followed by the
 		type of section. The standard section types are \c \@nodes, \c
 		\@arcs and \c \@edges
 		and \@attributes. Each header line may also have an optional
 		\e name, which can be use to distinguish the sections of the same
 		type.
 		The standard sections are column oriented, each line consists of
 		<em>token</em>s separated by whitespaces. A token can be \e plain or
 		\e quoted. A plain token is just a sequence of non-whitespace characters,
 		while a quoted token is a
 		character sequence surrounded by double quotes, and it can also
 		contain whitespaces and escape sequences.
 		The \c \@nodes section describes a set of nodes and associated
 		maps. The first is a header line, its columns are the names of the
 		maps appearing in the following lines.
 		One of the maps must be called \c
 		"label", which plays special role in the file.
 		The following
 		non-empty lines until the next section describes nodes of the
 		graph. Each line contains the values of the node maps
 		associated to the current node.
 		\code
 		 @nodes
 		 label  coordinates  size    title
 (10,20)      10      "First node"
 (80,80)      8       "Second node"
 (40,10)      10      "Third node"
 		\endcode
 		The \c \@arcs section is very similar to the \c \@nodes section,
 		it again starts with a header line describing the names of the maps,
 		but the \c "label" map is not obligatory here. The following lines
 		describe the arcs. The first two tokens of each line are
-		the source and the target node of the arc, respectively, then come the map
+		The \c \@arcs section is very similar to the \c \@nodes section, it
 		again starts with a header line describing the names of the maps, but
 		the \c "label" map is not obligatory here. The following lines
 		describe the arcs. The first two tokens of each line are the source
 		and the target node of the arc, respectively, then come the map
 		values. The source and target tokens must be node labels.
 		\code
 		 @arcs
 		         capacity
 2   16
 3   12
 3   18
 		\endcode
 		If there is no map in the \c \@arcs section at all, then it must be
 		indicated by a sole '-' sign in the first line.
 		\code
 		 @arcs
+		         -
 2
 3
 3
 		\endcode
 		The \c \@edges is just a synonym of \c \@arcs. The \@arcs section can
 		also store the edge set of an undirected graph. In such case there is
 		a conventional method for store arc maps in the file, if two columns
-		has the same caption with \c '+' and \c '-' prefix, then these columns
+		have the same caption with \c '+' and \c '-' prefix, then these columns
 		can be regarded as the values of an arc map.
 		The \c \@attributes section contains key-value pairs, each line
 		consists of two tokens, an attribute name, and then an attribute
 		value. The value of the attribute could be also a label value of a
 		node or an edge, or even an edge label prefixed with \c '+' or \c '-',
 		which regards to the forward or backward directed arc of the
 		corresponding edge.
 		\code
 		 @attributes
 		 source 1
 		 target 3
 		 caption "LEMON test digraph"
 		\endcode
 		The \e LGF can contain extra sections, but there is no restriction on
 		the format of such sections.
 		*/
+		}
 		//  LocalWords:  whitespace whitespaces

lemon/lgf_reader.h

Show inline comments

/* -*- mode: C++; indent-tabs-mode: nil; -*-
 *
 * This file is a part of LEMON, a generic C++ optimization library.
 *
 * Copyright (C) 2003-2010
 * Copyright (C) 2003-2011
 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 * (Egervary Research Group on Combinatorial Optimization, EGRES).
 *
 * Permission to use, modify and distribute this software is granted
 * provided that this copyright notice appears in all copies. For
 * precise terms see the accompanying LICENSE file.
 *
 * This software is provided "AS IS" with no warranty of any kind,
 * express or implied, and with no claim as to its suitability for any
 * purpose.
 *
 */

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


#ifndef LEMON_LGF_READER_H
#define LEMON_LGF_READER_H

#include <iostream>
#include <fstream>
#include <sstream>

#include <set>
#include <map>

#include <lemon/core.h>

#include <lemon/lgf_writer.h>

@@ -935,64 +935,71 @@
        }

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

      }
      if (readSuccess()) {
        line.putback(c);
      }
    }

    void readArcs() {

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

      char c;
      if (!readLine() || !(line >> c) || c == '@') {
        if (readSuccess() && line) line.putback(c);
        if (!_arc_maps.empty())
          throw FormatError("Cannot find map names");
        return;
      }
      line.putback(c);

      {
        std::map<std::string, int> maps;

        std::string map;
        int index = 0;
        while (_reader_bits::readToken(line, map)) {
          if(map == "-") {
              if(index!=0)
                throw FormatError("'-' is not allowed as a map name");
              else if (line >> std::ws >> c)
                throw FormatError("Extra character at the end of line");
              else break;
            }
          if (maps.find(map) != maps.end()) {
            std::ostringstream msg;
            msg << "Multiple occurence of arc map: " << map;
            throw FormatError(msg.str());
          }
          maps.insert(std::make_pair(map, index));
          ++index;
        }

        for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
          std::map<std::string, int>::iterator jt =
            maps.find(_arc_maps[i].first);
          if (jt == maps.end()) {
            std::ostringstream msg;
            msg << "Map not found: " << _arc_maps[i].first;
            throw FormatError(msg.str());
          }
          map_index[i] = jt->second;
        }

        {
          std::map<std::string, int>::iterator jt = maps.find("label");
          if (jt != maps.end()) {
            label_index = jt->second;
          } else {
            label_index = -1;
          }
        }
        map_num = maps.size();
      }

      while (readLine() && line >> c && c != '@') {
@@ -1805,64 +1812,71 @@
        }

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

      }
      if (readSuccess()) {
        line.putback(c);
      }
    }

    void readEdges() {

      std::vector<int> map_index(_edge_maps.size());
      int map_num, label_index;

      char c;
      if (!readLine() || !(line >> c) || c == '@') {
        if (readSuccess() && line) line.putback(c);
        if (!_edge_maps.empty())
          throw FormatError("Cannot find map names");
        return;
      }
      line.putback(c);

      {
        std::map<std::string, int> maps;

        std::string map;
        int index = 0;
        while (_reader_bits::readToken(line, map)) {
          if(map == "-") {
              if(index!=0)
                throw FormatError("'-' is not allowed as a map name");
              else if (line >> std::ws >> c)
                throw FormatError("Extra character at the end of line");
              else break;
            }
          if (maps.find(map) != maps.end()) {
            std::ostringstream msg;
            msg << "Multiple occurence of edge map: " << map;
            throw FormatError(msg.str());
          }
          maps.insert(std::make_pair(map, index));
          ++index;
        }

        for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
          std::map<std::string, int>::iterator jt =
            maps.find(_edge_maps[i].first);
          if (jt == maps.end()) {
            std::ostringstream msg;
            msg << "Map not found: " << _edge_maps[i].first;
            throw FormatError(msg.str());
          }
          map_index[i] = jt->second;
        }

        {
          std::map<std::string, int>::iterator jt = maps.find("label");
          if (jt != maps.end()) {
            label_index = jt->second;
          } else {
            label_index = -1;
          }
        }
        map_num = maps.size();
      }

      while (readLine() && line >> c && c != '@') {

test/CMakeLists.txt

Show inline comments

@@ -4,64 +4,65 @@
+		)
 		LINK_DIRECTORIES(
 		  ${PROJECT_BINARY_DIR}/lemon
+		)
 		SET(TEST_WITH_VALGRIND "NO" CACHE STRING
 		  "Run the test with valgrind (YES/NO).")
 		SET(VALGRIND_FLAGS "" CACHE STRING "Valgrind flags used by the tests.")
 		SET(TESTS
 		  adaptors_test
 		  bellman_ford_test
 		  bfs_test
 		  circulation_test
 		  connectivity_test
 		  counter_test
 		  dfs_test
 		  digraph_test
 		  dijkstra_test
 		  dim_test
 		  edge_set_test
 		  error_test
 		  euler_test
 		  fractional_matching_test
 		  gomory_hu_test
 		  graph_copy_test
 		  graph_test
 		  graph_utils_test
 		  hao_orlin_test
 		  heap_test
 		  kruskal_test
 		  lgf_test
 		  maps_test
 		  matching_test
 		  min_cost_arborescence_test
 		  min_cost_flow_test
 		  min_mean_cycle_test
 		  path_test
 		  planarity_test
 		  preflow_test
 		  radix_sort_test
 		  random_test
 		  suurballe_test
 		  time_measure_test
 		  unionfind_test
+		)
 		IF(LEMON_HAVE_LP)
 		  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
 		    ADD_EXECUTABLE(lp_test lp_test.cc)
 		  ELSE()
 		    ADD_EXECUTABLE(lp_test EXCLUDE_FROM_ALL lp_test.cc)
 		  ENDIF()
 		  SET(LP_TEST_LIBS lemon)
 		  IF(LEMON_HAVE_GLPK)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
 		  ENDIF()
 		  IF(LEMON_HAVE_CPLEX)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
 		  ENDIF()
 		  IF(LEMON_HAVE_CLP)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})

test/Makefile.am

Show inline comments

@@ -2,98 +2,100 @@
 		TESTS_ENVIRONMENT=$(top_srcdir)/scripts/valgrind-wrapper.sh
 		endif
 		EXTRA_DIST += \
 			test/CMakeLists.txt
 		noinst_HEADERS += \
 			test/graph_test.h \
 			test/test_tools.h
 		check_PROGRAMS += \
 			test/adaptors_test \
 			test/bellman_ford_test \
 			test/bfs_test \
 			test/circulation_test \
 			test/connectivity_test \
 			test/counter_test \
 			test/dfs_test \
 			test/digraph_test \
 			test/dijkstra_test \
 			test/dim_test \
 			test/edge_set_test \
 			test/error_test \
 			test/euler_test \
 			test/fractional_matching_test \
 			test/gomory_hu_test \
 			test/graph_copy_test \
 			test/graph_test \
 			test/graph_utils_test \
 			test/hao_orlin_test \
 			test/heap_test \
 			test/kruskal_test \
 			test/lgf_test \
 			test/maps_test \
 			test/matching_test \
 			test/min_cost_arborescence_test \
 			test/min_cost_flow_test \
 			test/min_mean_cycle_test \
 			test/path_test \
 			test/planarity_test \
 			test/preflow_test \
 			test/radix_sort_test \
 			test/random_test \
 			test/suurballe_test \
 			test/test_tools_fail \
 			test/test_tools_pass \
 			test/time_measure_test \
 			test/unionfind_test
 		test_test_tools_pass_DEPENDENCIES = demo
 		if HAVE_LP
 		check_PROGRAMS += test/lp_test
 		endif HAVE_LP
 		if HAVE_MIP
 		check_PROGRAMS += test/mip_test
 		endif HAVE_MIP
 		TESTS += $(check_PROGRAMS)
 		XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
 		test_adaptors_test_SOURCES = test/adaptors_test.cc
 		test_bellman_ford_test_SOURCES = test/bellman_ford_test.cc
 		test_bfs_test_SOURCES = test/bfs_test.cc
 		test_circulation_test_SOURCES = test/circulation_test.cc
 		test_counter_test_SOURCES = test/counter_test.cc
 		test_connectivity_test_SOURCES = test/connectivity_test.cc
 		test_dfs_test_SOURCES = test/dfs_test.cc
 		test_digraph_test_SOURCES = test/digraph_test.cc
 		test_dijkstra_test_SOURCES = test/dijkstra_test.cc
 		test_dim_test_SOURCES = test/dim_test.cc
 		test_edge_set_test_SOURCES = test/edge_set_test.cc
 		test_error_test_SOURCES = test/error_test.cc
 		test_euler_test_SOURCES = test/euler_test.cc
 		test_fractional_matching_test_SOURCES = test/fractional_matching_test.cc
 		test_gomory_hu_test_SOURCES = test/gomory_hu_test.cc
 		test_graph_copy_test_SOURCES = test/graph_copy_test.cc
 		test_graph_test_SOURCES = test/graph_test.cc
 		test_graph_utils_test_SOURCES = test/graph_utils_test.cc
 		test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
 		test_heap_test_SOURCES = test/heap_test.cc
 		test_kruskal_test_SOURCES = test/kruskal_test.cc
-		test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
+		test_lgf_test_SOURCES = test/lgf_test.cc
 		test_lp_test_SOURCES = test/lp_test.cc
 		test_maps_test_SOURCES = test/maps_test.cc
 		test_mip_test_SOURCES = test/mip_test.cc
 		test_matching_test_SOURCES = test/matching_test.cc
 		test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
 		test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
 		test_min_mean_cycle_test_SOURCES = test/min_mean_cycle_test.cc
 		test_path_test_SOURCES = test/path_test.cc
 		test_planarity_test_SOURCES = test/planarity_test.cc
 		test_preflow_test_SOURCES = test/preflow_test.cc
 		test_radix_sort_test_SOURCES = test/radix_sort_test.cc
 		test_suurballe_test_SOURCES = test/suurballe_test.cc
 		test_random_test_SOURCES = test/random_test.cc
 		test_test_tools_fail_SOURCES = test/test_tools_fail.cc
 		test_test_tools_pass_SOURCES = test/test_tools_pass.cc
 		test_time_measure_test_SOURCES = test/time_measure_test.cc
 		test_unionfind_test_SOURCES = test/unionfind_test.cc

0 comments (0 inline)

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-~~2010~~
	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
...	...	@@ -935,64 +935,71 @@
935	935	}
936	936
937	937	for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
938	938	_node_maps[i].second->set(n, tokens[map_index[i]]);
939	939	}
940	940
941	941	}
942	942	if (readSuccess()) {
943	943	line.putback(c);
944	944	}
945	945	}
946	946
947	947	void readArcs() {
948	948
949	949	std::vector<int> map_index(_arc_maps.size());
950	950	int map_num, label_index;
951	951
952	952	char c;
953	953	if (!readLine() \|\| !(line >> c) \|\| c == '@') {
954	954	if (readSuccess() && line) line.putback(c);
955	955	if (!_arc_maps.empty())
956	956	throw FormatError("Cannot find map names");
957	957	return;
958	958	}
959	959	line.putback(c);
960	960
961	961	{
962	962	std::map<std::string, int> maps;
963	963
964	964	std::string map;
965	965	int index = 0;
966	966	while (_reader_bits::readToken(line, map)) {
	967	if(map == "-") {
	968	if(index!=0)
	969	throw FormatError("'-' is not allowed as a map name");
	970	else if (line >> std::ws >> c)
	971	throw FormatError("Extra character at the end of line");
	972	else break;
	973	}
967	974	if (maps.find(map) != maps.end()) {
968	975	std::ostringstream msg;
969	976	msg << "Multiple occurence of arc map: " << map;
970	977	throw FormatError(msg.str());
971	978	}
972	979	maps.insert(std::make_pair(map, index));
973	980	++index;
974	981	}
975	982
976	983	for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
977	984	std::map<std::string, int>::iterator jt =
978	985	maps.find(_arc_maps[i].first);
979	986	if (jt == maps.end()) {
980	987	std::ostringstream msg;
981	988	msg << "Map not found: " << _arc_maps[i].first;
982	989	throw FormatError(msg.str());
983	990	}
984	991	map_index[i] = jt->second;
985	992	}
986	993
987	994	{
988	995	std::map<std::string, int>::iterator jt = maps.find("label");
989	996	if (jt != maps.end()) {
990	997	label_index = jt->second;
991	998	} else {
992	999	label_index = -1;
993	1000	}
994	1001	}
995	1002	map_num = maps.size();
996	1003	}
997	1004
998	1005	while (readLine() && line >> c && c != '@') {
...	...	@@ -1805,64 +1812,71 @@
1805	1812	}
1806	1813
1807	1814	for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
1808	1815	_node_maps[i].second->set(n, tokens[map_index[i]]);
1809	1816	}
1810	1817
1811	1818	}
1812	1819	if (readSuccess()) {
1813	1820	line.putback(c);
1814	1821	}
1815	1822	}
1816	1823
1817	1824	void readEdges() {
1818	1825
1819	1826	std::vector<int> map_index(_edge_maps.size());
1820	1827	int map_num, label_index;
1821	1828
1822	1829	char c;
1823	1830	if (!readLine() \|\| !(line >> c) \|\| c == '@') {
1824	1831	if (readSuccess() && line) line.putback(c);
1825	1832	if (!_edge_maps.empty())
1826	1833	throw FormatError("Cannot find map names");
1827	1834	return;
1828	1835	}
1829	1836	line.putback(c);
1830	1837
1831	1838	{
1832	1839	std::map<std::string, int> maps;
1833	1840
1834	1841	std::string map;
1835	1842	int index = 0;
1836	1843	while (_reader_bits::readToken(line, map)) {
	1844	if(map == "-") {
	1845	if(index!=0)
	1846	throw FormatError("'-' is not allowed as a map name");
	1847	else if (line >> std::ws >> c)
	1848	throw FormatError("Extra character at the end of line");
	1849	else break;
	1850	}
1837	1851	if (maps.find(map) != maps.end()) {
1838	1852	std::ostringstream msg;
1839	1853	msg << "Multiple occurence of edge map: " << map;
1840	1854	throw FormatError(msg.str());
1841	1855	}
1842	1856	maps.insert(std::make_pair(map, index));
1843	1857	++index;
1844	1858	}
1845	1859
1846	1860	for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
1847	1861	std::map<std::string, int>::iterator jt =
1848	1862	maps.find(_edge_maps[i].first);
1849	1863	if (jt == maps.end()) {
1850	1864	std::ostringstream msg;
1851	1865	msg << "Map not found: " << _edge_maps[i].first;
1852	1866	throw FormatError(msg.str());
1853	1867	}
1854	1868	map_index[i] = jt->second;
1855	1869	}
1856	1870
1857	1871	{
1858	1872	std::map<std::string, int>::iterator jt = maps.find("label");
1859	1873	if (jt != maps.end()) {
1860	1874	label_index = jt->second;
1861	1875	} else {
1862	1876	label_index = -1;
1863	1877	}
1864	1878	}
1865	1879	map_num = maps.size();
1866	1880	}
1867	1881
1868	1882	while (readLine() && line >> c && c != '@') {

RhodeCode

Login to your account