diff -r 9eac00ea588f -r dceba191c00d test/max_clique_test.cc --- a/test/max_clique_test.cc Fri Aug 09 14:07:27 2013 +0200 +++ b/test/max_clique_test.cc Fri Aug 09 11:28:17 2013 +0200 @@ -2,7 +2,7 @@ * * This file is a part of LEMON, a generic C++ optimization library. * - * Copyright (C) 2003-2010 + * Copyright (C) 2003-2013 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport * (Egervary Research Group on Combinatorial Optimization, EGRES). * @@ -54,7 +54,7 @@ "5 6 13\n" "5 7 14\n" "6 7 15\n"; - + // Check with general graphs template @@ -62,7 +62,7 @@ typedef ListGraph GR; typedef GrossoLocatelliPullanMc McAlg; typedef McAlg::CliqueNodeIt CliqueIt; - + // Basic tests { GR g; @@ -81,7 +81,7 @@ CliqueIt it1(mc); check(static_cast(it1) == u && ++it1 == INVALID, "Wrong CliqueNodeIt"); - + GR::Node v = g.addNode(); check(mc.run(rule) == McAlg::ITERATION_LIMIT, "Wrong termination cause"); check(mc.cliqueSize() == 1, "Wrong clique size"); @@ -109,7 +109,7 @@ graphReader(g, input) .nodeMap("max_clique", max_clique) .run(); - + McAlg mc(g); mc.iterationLimit(50); check(mc.run(rule) == McAlg::ITERATION_LIMIT, "Wrong termination cause"); @@ -133,7 +133,7 @@ typedef FullGraph GR; typedef GrossoLocatelliPullanMc McAlg; typedef McAlg::CliqueNodeIt CliqueIt; - + for (int size = 0; size <= 40; size = size * 3 + 1) { GR g(size); GR::NodeMap map(g); @@ -156,7 +156,7 @@ GridGraph g(5, 7); GridGraph::NodeMap map(g); GrossoLocatelliPullanMc mc(g); - + mc.iterationLimit(100); check(mc.run(rule) == mc.ITERATION_LIMIT, "Wrong termination cause"); check(mc.cliqueSize() == 2, "Wrong clique size"); @@ -179,10 +179,10 @@ checkMaxCliqueFullGraph(GrossoLocatelliPullanMc::RANDOM); checkMaxCliqueFullGraph(GrossoLocatelliPullanMc::DEGREE_BASED); checkMaxCliqueFullGraph(GrossoLocatelliPullanMc::PENALTY_BASED); - + checkMaxCliqueGridGraph(GrossoLocatelliPullanMc::RANDOM); checkMaxCliqueGridGraph(GrossoLocatelliPullanMc::DEGREE_BASED); checkMaxCliqueGridGraph(GrossoLocatelliPullanMc::PENALTY_BASED); - + return 0; }