[Lemon-commits] [lemon_svn] alpar: r1307 - in hugo/branches/graph_factory/src: benchmark lemon lemon/skeletons

[Lemon SVN]

Author: alpar
Date: Fri Oct 22 19:21:07 2004
New Revision: 1307

Modified:
   hugo/branches/graph_factory/src/benchmark/hcube.cc
   hugo/branches/graph_factory/src/lemon/Makefile.am
   hugo/branches/graph_factory/src/lemon/skeletons/graph_component.h

Log:
Modification so that 'make check' will pass:
- setToIt() temporarily removed from src/benchmark/hcube.cc
- correct src/lemon/Makefile.am
Others:
- Modify #ifndef in src/lemon/skeletons/graph_component.h to follow the
  naming conventions.

Modified: hugo/branches/graph_factory/src/benchmark/hcube.cc
==============================================================================
--- hugo/branches/graph_factory/src/benchmark/hcube.cc	(original)
+++ hugo/branches/graph_factory/src/benchmark/hcube.cc	Fri Oct 22 19:21:07 2004
@@ -66,12 +66,15 @@
     for(int i=0;i<dim*(1<<dim);i++) P();
     
     //  for(EdgeIt e(G);G.valid(e);G.next(e)) map[e]=P();
-    Edge te;
-    for(int i=0;i<dim*(1<<dim);i++) {
-      te.setToId(((long long int)(i)*93505)%(dim*(1<<dim)));
-      //    map[Edge(((long long int)(i)*2987)%(dim*(1<<dim)))]=P();
-      map[te]=P();
-    }
+
+    ///\todo It must have been commented out because of
+    ///setToId
+//     Edge te;
+//     for(int i=0;i<dim*(1<<dim);i++) {
+//       te.setToId(((long long int)(i)*93505)%(dim*(1<<dim)));
+//       //    map[Edge(((long long int)(i)*2987)%(dim*(1<<dim)))]=P();
+//       map[te]=P();
+//     }
     
 //     for(int i=0;i<(1<<dim);i++) {
 //       int mul= (1<<(numOfZeros(i,dim)/4));

Modified: hugo/branches/graph_factory/src/lemon/Makefile.am
==============================================================================
--- hugo/branches/graph_factory/src/lemon/Makefile.am	(original)
+++ hugo/branches/graph_factory/src/lemon/Makefile.am	Fri Oct 22 19:21:07 2004
@@ -34,8 +34,7 @@
 
 noinst_HEADERS =							\
 	skeletons/graph.h						\
-	skeletons/base_graph.h						\
-        skeletons/extended_graph.h					\
+	skeletons/graph_component.h					\
 	skeletons/sym_graph.h                                           \
 	skeletons/maps.h                                                \
 	skeletons/path.h

Modified: hugo/branches/graph_factory/src/lemon/skeletons/graph_component.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/skeletons/graph_component.h	(original)
+++ hugo/branches/graph_factory/src/lemon/skeletons/graph_component.h	Fri Oct 22 19:21:07 2004
@@ -1,5 +1,5 @@
 /* -*- C++ -*-
- * src/lemon/skeletons/base_graph.h - Part of LEMON, a generic C++ optimization library
+ * src/lemon/skeletons/graph_component.h - Part of LEMON, a generic C++ optimization library
  *
  * Copyright (C) 2004 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Combinatorial Optimization Research Group, EGRES).
@@ -19,8 +19,8 @@
 ///\brief The graph components.
 
 
-#ifndef LEMON_SKELETON_BASE_GRAPH_H
-#define LEMON_SKELETON_BASE_GRAPH_H
+#ifndef LEMON_SKELETON_GRAPH_COMPONENT_H
+#define LEMON_SKELETON_GRAPH_COMPONENT_H
 
 #include <lemon/invalid.h>
 #include <lemon/skeletons/maps.h>