Changeset 1150:9147b013331a in lemon for lemon
 Timestamp:
 08/24/12 15:41:46 (9 years ago)
 Branch:
 1.1
 Parents:
 1145:98b306776b25 (diff), 1149:157427808b40 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.  Phase:
 public
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

lemon/core.h
r1081 r1150 1850 1850 ///a single node \c n, then \ref refresh(Node) "refresh(n)" is enough. 1851 1851 /// 1852 #ifdef DOXYGEN 1853 Arc operator()(Node s, Node t, Arc prev=INVALID) const {} 1854 #else 1855 using ArcLookUp<GR>::operator() ; 1856 Arc operator()(Node s, Node t, Arc prev) const 1852 Arc operator()(Node s, Node t, Arc prev=INVALID) const 1857 1853 { 1858 return prev==INVALID?(*this)(s,t):_next[prev]; 1859 } 1854 if(prev==INVALID) 1855 { 1856 Arc f=INVALID; 1857 Arc e; 1858 for(e=_head[s]; 1859 e!=INVALID&&_g.target(e)!=t; 1860 e = t < _g.target(e)?_left[e]:_right[e]) ; 1861 while(e!=INVALID) 1862 if(_g.target(e)==t) 1863 { 1864 f = e; 1865 e = _left[e]; 1866 } 1867 else e = _right[e]; 1868 return f; 1869 } 1870 else return _next[prev]; 1871 } 1872 1873 }; 1874 1875 /// @} 1876 1877 } //namespace lemon 1878 1860 1879 #endif 1861 1862 };1863 1864 /// @}1865 1866 } //namespace lemon1867 1868 #endif 
lemon/core.h
r1149 r1150 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 200320 095 * Copyright (C) 20032011 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). … … 1242 1242 protected: 1243 1243 1244 class AutoNodeMap : public ItemSetTraits<GR, Node>::template Map<Arc>::Type { 1244 class AutoNodeMap : 1245 public ItemSetTraits<GR, Node>::template Map<Arc>::Type { 1245 1246 typedef typename ItemSetTraits<GR, Node>::template Map<Arc>::Type Parent; 1246 1247 … … 1281 1282 }; 1282 1283 1283 protected: 1284 protected: 1284 1285 1285 1286 const Digraph &_g;
Note: See TracChangeset
for help on using the changeset viewer.