COIN-OR::LEMON - Graph Library

Changes in / [140:356930927a71:145:95d905b6e33d] in lemon-1.0


Ignore:
Files:
4 added
6 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • .hgignore

    r128 r141  
    3535^test/[a-z_]*$
    3636^demo/.*_demo$
     37^build/.*
     38CMakeFiles
     39DartTestfile.txt
     40cmake_install.cmake
     41CMakeCache.txt
  • demo/lgf_demo.cc

    r127 r143  
    3838int main(int argc, const char *argv[]) {
    3939  const int n = argc > 1 ? std::atoi(argv[1]) : 20;
    40   const int e = argc > 2 ? std::atoi(argv[2]) : static_cast<int>(n * log(n));
     40  const int e = argc > 2 ? std::atoi(argv[2]) : static_cast<int>(n * std::log(double(n)));
    4141  const int m = argc > 3 ? std::atoi(argv[3]) : 100;
    4242
  • lemon/assert.h

    r118 r142  
    104104
    105105#ifndef LEMON_FUNCTION_NAME
    106 #  define LEMON_FUNCTION_NAME (__PRETTY_FUNCTION__)
     106#  if defined __GNUC__
     107#    define LEMON_FUNCTION_NAME (__PRETTY_FUNCTION__)
     108#  elif defined _MSC_VER
     109#    define LEMON_FUNCTION_NAME (__FUNCSIG__)
     110#  else
     111#    define LEMON_FUNCTION_NAME (__func__)
     112#  endif
    107113#endif
    108114
  • lemon/graph_to_eps.h

    r134 r143  
    3030#include<ctime>
    3131#else
     32#define WIN32_LEAN_AND_MEAN
     33#define NOMINMAX
    3234#include<windows.h>
    3335#endif
  • lemon/path.h

    r100 r144  
    904904
    905905    template <typename Path, typename Enable = void>
    906     struct RevTagIndicator {
     906    struct RevPathTagIndicator {
    907907      static const bool value = false;
    908908    };
    909909
    910     template <typename Digraph>
    911     struct RevTagIndicator<
    912       Digraph,
    913       typename enable_if<typename Digraph::RevTag, void>::type
     910    template <typename Path>
     911    struct RevPathTagIndicator<
     912      Path,
     913      typename enable_if<typename Path::RevPathTag, void>::type
     914      > {
     915      static const bool value = true;
     916    };
     917
     918    template <typename Path, typename Enable = void>
     919    struct BuildTagIndicator {
     920      static const bool value = false;
     921    };
     922
     923    template <typename Path>
     924    struct BuildTagIndicator<
     925      Path,
     926      typename enable_if<typename Path::BuildTag, void>::type
    914927    > {
    915928      static const bool value = true;
     
    917930
    918931    template <typename Target, typename Source,
    919               typename BuildEnable = void, typename RevEnable = void>
     932              bool buildEnable = BuildTagIndicator<Target>::value,
     933              bool revEnable = RevPathTagIndicator<Source>::value>
    920934    struct PathCopySelector {
    921935      static void copy(Target& target, const Source& source) {
     
    927941    };
    928942
    929     template <typename Target, typename Source, typename BuildEnable>
    930     struct PathCopySelector<
    931       Target, Source, BuildEnable,
    932       typename enable_if<typename Source::RevPathTag, void>::type> {
     943    template <typename Target, typename Source>
     944    struct PathCopySelector<Target, Source, false, true> {
    933945      static void copy(Target& target, const Source& source) {
    934946        target.clear();
     
    939951    };
    940952
    941     template <typename Target, typename Source, typename RevEnable>
    942     struct PathCopySelector<
    943       Target, Source,
    944       typename enable_if<typename Target::BuildTag, void>::type, RevEnable> {
     953    template <typename Target, typename Source>
     954    struct PathCopySelector<Target, Source, true, false> {
    945955      static void copy(Target& target, const Source& source) {
    946956        target.clear();
     
    950960
    951961    template <typename Target, typename Source>
    952     struct PathCopySelector<
    953       Target, Source,
    954       typename enable_if<typename Target::BuildTag, void>::type,
    955       typename enable_if<typename Source::RevPathTag, void>::type> {
     962    struct PathCopySelector<Target, Source, true, true> {
    956963      static void copy(Target& target, const Source& source) {
    957964        target.clear();
  • lemon/time_measure.h

    r126 r143  
    2525
    2626#ifdef WIN32
     27#define WIN32_LEAN_AND_MEAN
     28#define NOMINMAX
    2729#include <windows.h>
    2830#include <cmath>
     
    3234#endif
    3335
     36#include <string>
    3437#include <fstream>
    3538#include <iostream>
Note: See TracChangeset for help on using the changeset viewer.