Changeset 2172:4b25e7003868 in lemon-0.x

Timestamp:

08/10/06 12:18:04 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2887

Message:

• Change ColorSet? to Palette
• Minor change in graph_orientation demo.

Files:

• demo/coloring.cc (modified) (1 diff)
• demo/graph_orientation.cc (modified) (2 diffs)
• demo/graph_to_eps_demo.cc (modified) (9 diffs)
• demo/grid_ugraph_demo.cc (modified) (1 diff)
• demo/topology_demo.cc (modified) (9 diffs)
• doc/graph_orientation.dox (modified) (2 diffs)
• lemon/color.h (modified) (2 diffs)
• lemon/graph_to_eps.h (modified) (3 diffs)

demo/coloring.cc

@@ -98 +98 @@
   }
 
-  ColorSet colorSet;
+  Palette palette;
 
   graphToEps(graph, "coloring.eps").
     title("Six Colored Plan Graph").copyright("(C) 2006 LEMON Project").
-    coords(coords).nodeColors(composeMap(colorSet, color)).
+    coords(coords).nodeColors(composeMap(palette, color)).
     nodeScale(5.0).scaleToA4().run();
 

demo/graph_orientation.cc

@@ -26 +26 @@
 using namespace lemon;
  
-
-typedef ListGraph::Node Node;
-typedef ListGraph::NodeIt NodeIt;
-typedef ListGraph::Edge Edge;
-typedef ListGraph::EdgeIt EdgeIt;
-typedef ListGraph::OutEdgeIt OutEdgeIt;
-typedef ListGraph::InEdgeIt InEdgeIt;
+GRAPH_TYPEDEFS(ListGraph)
 
 int main(int argc, char** argv) 
@@ -114 +108 @@
     coords(coords).
     negateY().
-    edgeColors(composeMap(ColorSet(),rev)).
+    edgeColors(composeMap(Palette(),rev)).
     edgeWidthScale(1).
     nodeTexts(f).nodeTextSize(20).

demo/graph_to_eps_demo.cc

@@ -42 +42 @@
 int main()
 {
-  ColorSet colorSet;
+  Palette palette;
 
   ListGraph g;
@@ -89 +89 @@
     nodeScale(2).nodeSizes(sizes).
     nodeShapes(shapes).
-    nodeColors(composeMap(colorSet,colors)).
-    edgeColors(composeMap(colorSet,ecolors)).
+    nodeColors(composeMap(palette,colors)).
+    edgeColors(composeMap(palette,ecolors)).
     edgeWidthScale(.4).edgeWidths(widths).
     nodeTexts(id).nodeTextSize(3).
@@ -101 +101 @@
     title("Sample .eps figure (with arrowheads)").
     copyright("(C) 2006 LEMON Project").
-    nodeColors(composeMap(colorSet,colors)).
+    nodeColors(composeMap(palette,colors)).
     coords(coords).
     nodeScale(2).nodeSizes(sizes).
     nodeShapes(shapes).
-    edgeColors(composeMap(colorSet,ecolors)).
+    edgeColors(composeMap(palette,ecolors)).
     edgeWidthScale(.4).edgeWidths(widths).
     nodeTexts(id).nodeTextSize(3).
@@ -130 +130 @@
     coords(coords).
     nodeScale(2).nodeSizes(sizes).
-    nodeColors(composeMap(colorSet,colors)).
-    edgeColors(composeMap(colorSet,ecolors)).
+    nodeColors(composeMap(palette,colors)).
+    edgeColors(composeMap(palette,ecolors)).
     edgeWidthScale(.4).edgeWidths(widths).
     nodeTexts(id).nodeTextSize(3).
@@ -145 +145 @@
     coords(coords).
     nodeShapes(shapes).
-    nodeColors(composeMap(colorSet,colors)).
-    edgeColors(composeMap(colorSet,ecolors)).
+    nodeColors(composeMap(palette,colors)).
+    edgeColors(composeMap(palette,ecolors)).
     edgeWidthScale(.3).edgeWidths(widths).
     nodeTexts(id).nodeTextSize(3).
@@ -160 +160 @@
     coords(coords).
     nodeShapes(shapes).
-    nodeColors(composeMap(colorSet,colors)).
-    edgeColors(composeMap(colorSet,ecolors)).
+    nodeColors(composeMap(palette,colors)).
+    edgeColors(composeMap(palette,ecolors)).
     edgeWidthScale(.3).edgeWidths(widths).
     nodeTexts(id).nodeTextSize(3).
@@ -172 +172 @@
   ListGraph::NodeMap<Xy> hcoords(h);
   
-  int cols=int(sqrt(double(colorSet.size())));
-  for(int i=0;i<int(colorSet.size());i++) {
+  int cols=int(sqrt(double(palette.size())));
+  for(int i=0;i<int(palette.size());i++) {
     Node n=h.addNode();
     hcoords[n]=Xy(i%cols,i/cols);
@@ -182 +182 @@
   graphToEps(h,"graph_to_eps_demo_out_colors.eps").
     //scale(60).
-    title("Sample .eps figure (ColorSet demo)").
+    title("Sample .eps figure (Palette demo)").
     copyright("(C) 2006 LEMON Project").
     coords(hcoords).
@@ -189 +189 @@
     //    distantBWNodeTexts().
     nodeTexts(hcolors).nodeTextSize(.6).
-    nodeColors(composeMap(colorSet,hcolors)).
+    nodeColors(composeMap(palette,hcolors)).
     run();
 

demo/grid_ugraph_demo.cc

@@ -93 +93 @@
     nodeScale(0.5).
     drawArrows().
-    edgeColors(composeMap(ColorSet(), path)).
+    edgeColors(composeMap(Palette(), path)).
     run();
   

demo/topology_demo.cc

@@ -57 +57 @@
     run();
   
-  ColorSet colorSet;
+  Palette palette;
 
   Graph::NodeMap<int> compMap(graph);
@@ -65 +65 @@
     coords(coords).scaleToA4().enableParallel().
     parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0).
-    nodeColors(composeMap(colorSet, compMap)).run();
+    nodeColors(composeMap(palette, compMap)).run();
 
   std::cout << "Result: connected_components.eps" << std::endl;
@@ -82 +82 @@
     run();
   
-  ColorSet colorSet;
+  Palette palette;
 
   Graph::NodeMap<int> compMap(graph);
@@ -93 +93 @@
     drawArrows().arrowWidth(10.0).arrowLength(10.0).
     parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0).
-    nodeColors(composeMap(colorSet, compMap)).
+    nodeColors(composeMap(palette, compMap)).
     edgeColors(composeMap(functorMap(&color), cutMap)).run();
 
@@ -112 +112 @@
     run();
 
-  ColorSet colorSet;
+  Palette palette;
 
   Graph::UEdgeMap<int> compMap(graph);
@@ -122 +122 @@
     coords(coords).scaleToA4().enableParallel().
     parEdgeDist(20.0).edgeWidthScale(5.0).nodeScale(20.0).
-    edgeColors(composeMap(colorSet, compMap)).
+    edgeColors(composeMap(palette, compMap)).
     nodeColors(composeMap(functorMap(&color), cutMap)).
     run();
@@ -142 +142 @@
     run();
   
-  ColorSet colorSet;
+  Palette palette;
 
   Graph::NodeMap<int> compMap(graph);
@@ -152 +152 @@
     coords(coords).scaleToA4().enableParallel().
     parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0).
-    nodeColors(composeMap(colorSet, compMap)).
+    nodeColors(composeMap(palette, compMap)).
     edgeColors(composeMap(functorMap(&color), cutMap)).run();
   
@@ -171 +171 @@
     run();
   
-  ColorSet colorSet;
+  Palette palette;
 
   Graph::NodeMap<bool> partMap(graph);

doc/graph_orientation.dox

@@ -54 +54 @@
 \skipline namespace
 
-The following <tt>typedef</tt>s will also save a lot of typing.
-\skip typedef
-\until InEdgeIt
+The following macro will also save a lot of typing by defining some
+convenience <tt>typedef</tt>s.
+
+\skipline TYPEDEF
+
+Actually, the macro above would be equivalent with the following
+<tt>typedef</tt>s.
+
+\code
+typedef ListGraph::Node Node;
+typedef ListGraph::NodeIt NodeIt;
+typedef ListGraph::Edge Edge;
+typedef ListGraph::EdgeIt EdgeIt;
+typedef ListGraph::OutEdgeIt OutEdgeIt;
+typedef ListGraph::InEdgeIt InEdgeIt;
+\endcode
 
 \subsection go-alg-main The main() function
@@ -153 +166 @@
 \c rev are transformed into different \ref lemon::Color "RGB color"s
 using the class
-\ref lemon::ColorSet "ColorSet"
+\ref lemon::Palette "Palette"
 and the \ref map_adaptors "map adaptor" called
 \ref lemon::ComposeMap "composeMap".

lemon/color.h

@@ -82 +82 @@
 ///change the actual colors.
 
-class ColorSet : public MapBase<int,Color>
+class Palette : public MapBase<int,Color>
 {
   std::vector<Color> colors;
@@ -97 +97 @@
   ///the color list is filled repeatedly with the default color list.
   ///(The colors can be changed later on.)
-  ColorSet(bool have_white=false,int num=0)
+  Palette(bool have_white=false,int num=0)
   {
     do {

lemon/graph_to_eps.h

@@ -427 +427 @@
   ///\param x must be a node map with \ref Color values.
   ///
-  ///\sa ColorSet
+  ///\sa Palette
   template<class X> GraphToEps<NodeColorsTraits<X> >
   nodeColors(const X &x)
@@ -443 +443 @@
   ///\param x must be a node map with \ref Color values. 
   ///
-  ///\sa ColorSet
+  ///\sa Palette
   template<class X> GraphToEps<NodeTextColorsTraits<X> >
   nodeTextColors(const X &x)
@@ -461 +461 @@
   ///\param x must be a edge map with \ref Color values. 
   ///
-  ///\sa ColorSet
+  ///\sa Palette
   template<class X> GraphToEps<EdgeColorsTraits<X> >
   edgeColors(const X &x)