LEMON/LEMON-main Changeset - r950:2d583da4ba40

Repositories » LEMON » LEMON-main

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

Changeset - r950:2d583da4ba40

« 949:544645
« 948:f9e3f7

952:98961d »

r950:2d583da4ba40

Thu, 04 Aug 2011 21:47:29

[Not Reviewed]

0 comments (0 inline)

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

Merge #382

0 4 1

merge default

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

@@ -42,66 +42,77 @@
 		<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>
@@ -943,48 +943,55 @@
 		        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;
@@ -1813,48 +1820,55 @@
 		        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;

test/CMakeLists.txt

Show inline comments

@@ -12,48 +12,49 @@
 		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
 		  max_cardinality_search_test
 		  max_clique_test
 		  min_cost_arborescence_test
 		  min_cost_flow_test
 		  min_mean_cycle_test
 		  nagamochi_ibaraki_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()

test/Makefile.am

Show inline comments

@@ -10,48 +10,49 @@
 			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/max_cardinality_search_test \
 			test/max_clique_test \
 			test/min_cost_arborescence_test \
 			test/min_cost_flow_test \
 			test/min_mean_cycle_test \
 			test/nagamochi_ibaraki_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
@@ -59,47 +60,48 @@
 		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_max_cardinality_search_test_SOURCES = test/max_cardinality_search_test.cc
 		test_max_clique_test_SOURCES = test/max_clique_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_nagamochi_ibaraki_test_SOURCES = test/nagamochi_ibaraki_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)

RhodeCode

Login to your account