From b1520dda65aa50fa9a1008a6a41cf96653572f84 Mon Sep 17 00:00:00 2001 From: jboisson Date: Thu, 20 Sep 2007 09:42:11 +0000 Subject: [PATCH] moILS has been added, berlin52.tsp too, moComparator, moFitComparator, ... git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@606 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-mo/doc/html/annotated.html | 28 +- .../doc/html/city__swap_8cpp-source.html | 54 + .../doc/html/city__swap_8h-source.html | 57 + .../doc/html/class_city_swap-members.html | 40 + .../doc/html/class_city_swap.html | 57 + .../doc/html/class_edge_xover-members.html | 45 + .../doc/html/class_edge_xover.html | 75 + .../doc/html/class_empty_selection.html | 5 +- .../doc/html/class_order_xover-members.html | 41 + .../doc/html/class_order_xover.html | 61 + .../html/class_part_route_eval-members.html | 43 + .../doc/html/class_part_route_eval.html | 68 + .../html/class_part_two_opt_init-members.html | 40 + .../doc/html/class_part_two_opt_init.html | 62 + .../doc/html/class_part_two_opt_init.png | Bin 0 -> 470 bytes .../html/class_part_two_opt_next-members.html | 39 + .../doc/html/class_part_two_opt_next.html | 58 + .../doc/html/class_part_two_opt_next.png | Bin 0 -> 512 bytes .../class_partial_mapped_xover-members.html | 41 + .../doc/html/class_partial_mapped_xover.html | 61 + .../doc/html/class_route_eval-members.html | 40 + .../doc/html/class_route_eval.html | 57 + .../doc/html/class_route_init-members.html | 40 + .../doc/html/class_route_init.html | 52 + .../doc/html/class_two_opt-members.html | 44 + .../paradiseo-mo/doc/html/class_two_opt.html | 66 + trunk/paradiseo-mo/doc/html/class_two_opt.png | Bin 0 -> 370 bytes .../html/class_two_opt_incr_eval-members.html | 40 + .../doc/html/class_two_opt_incr_eval.html | 57 + .../doc/html/class_two_opt_incr_eval.png | Bin 0 -> 514 bytes .../doc/html/class_two_opt_init-members.html | 40 + .../doc/html/class_two_opt_init.html | 62 + .../doc/html/class_two_opt_init.png | Bin 0 -> 440 bytes .../doc/html/class_two_opt_next-members.html | 40 + .../doc/html/class_two_opt_next.html | 62 + .../doc/html/class_two_opt_next.png | Bin 0 -> 475 bytes .../doc/html/class_two_opt_rand-members.html | 40 + .../doc/html/class_two_opt_rand.html | 57 + .../doc/html/class_two_opt_rand.png | Bin 0 -> 480 bytes .../html/class_two_opt_tabu_list-members.html | 46 + .../doc/html/class_two_opt_tabu_list.html | 133 ++ .../doc/html/class_two_opt_tabu_list.png | Bin 0 -> 472 bytes trunk/paradiseo-mo/doc/html/classes.html | 35 +- trunk/paradiseo-mo/doc/html/classmo_algo.html | 17 +- .../doc/html/classmo_aspir_crit-members.html | 9 +- .../doc/html/classmo_aspir_crit.html | 13 +- .../doc/html/classmo_aspir_crit.png | Bin 1805 -> 778 bytes .../classmo_best_impr_select-members.html | 10 +- .../doc/html/classmo_best_impr_select.html | 13 +- .../doc/html/classmo_best_impr_select.png | Bin 1074 -> 513 bytes .../doc/html/classmo_comparator.html | 63 + .../doc/html/classmo_comparator.png | Bin 0 -> 519 bytes .../doc/html/classmo_cooling_schedule.html | 15 +- .../doc/html/classmo_cooling_schedule.png | Bin 1297 -> 819 bytes ..._exponential_cooling_schedule-members.html | 10 +- .../classmo_exponential_cooling_schedule.html | 13 +- .../classmo_exponential_cooling_schedule.png | Bin 928 -> 565 bytes .../classmo_first_impr_select-members.html | 10 +- .../doc/html/classmo_first_impr_select.html | 13 +- .../doc/html/classmo_first_impr_select.png | Bin 1067 -> 512 bytes .../html/classmo_fit_comparator-members.html | 40 + .../doc/html/classmo_fit_comparator.html | 67 + .../doc/html/classmo_fit_comparator.png | Bin 0 -> 510 bytes .../classmo_fit_sol_continue-members.html | 19 +- .../doc/html/classmo_fit_sol_continue.html | 21 +- .../doc/html/classmo_fit_sol_continue.png | Bin 516 -> 516 bytes .../classmo_gen_sol_continue-members.html | 10 +- .../doc/html/classmo_gen_sol_continue.html | 13 +- .../doc/html/classmo_gen_sol_continue.png | Bin 900 -> 522 bytes .../doc/html/classmo_h_c-members.html | 17 +- trunk/paradiseo-mo/doc/html/classmo_h_c.html | 25 +- trunk/paradiseo-mo/doc/html/classmo_h_c.png | Bin 1507 -> 454 bytes .../classmo_h_c_move_loop_expl-members.html | 10 +- .../doc/html/classmo_h_c_move_loop_expl.html | 15 +- .../doc/html/classmo_h_c_move_loop_expl.png | Bin 1569 -> 658 bytes .../doc/html/classmo_i_l_s-members.html | 51 + .../paradiseo-mo/doc/html/classmo_i_l_s.html | 479 ++++++ trunk/paradiseo-mo/doc/html/classmo_i_l_s.png | Bin 0 -> 455 bytes ...ssmo_impr_best_fit_aspir_crit-members.html | 10 +- .../classmo_impr_best_fit_aspir_crit.html | 13 +- .../html/classmo_impr_best_fit_aspir_crit.png | Bin 1309 -> 548 bytes .../classmo_it_rand_next_move-members.html | 10 +- .../doc/html/classmo_it_rand_next_move.html | 15 +- .../doc/html/classmo_it_rand_next_move.png | Bin 1033 -> 511 bytes .../html/classmo_l_s_check_point-members.html | 9 +- .../doc/html/classmo_l_s_check_point.html | 19 +- ...assmo_linear_cooling_schedule-members.html | 10 +- .../html/classmo_linear_cooling_schedule.html | 13 +- .../html/classmo_linear_cooling_schedule.png | Bin 859 -> 515 bytes .../doc/html/classmo_move-members.html | 9 +- trunk/paradiseo-mo/doc/html/classmo_move.html | 13 +- .../doc/html/classmo_move_expl.html | 17 +- .../doc/html/classmo_move_expl.png | Bin 1884 -> 983 bytes .../doc/html/classmo_move_incr_eval.html | 15 +- .../doc/html/classmo_move_init.html | 15 +- .../doc/html/classmo_move_loop_expl.html | 15 +- .../doc/html/classmo_move_loop_expl.png | Bin 2000 -> 1024 bytes .../doc/html/classmo_move_select-members.html | 9 +- .../doc/html/classmo_move_select.html | 15 +- .../doc/html/classmo_move_select.png | Bin 1886 -> 988 bytes .../doc/html/classmo_next_move.html | 13 +- .../doc/html/classmo_next_move.png | Bin 1050 -> 518 bytes .../html/classmo_no_aspir_crit-members.html | 9 +- .../doc/html/classmo_no_aspir_crit.html | 9 +- .../doc/html/classmo_no_aspir_crit.png | Bin 1254 -> 478 bytes ...ssmo_no_fit_impr_sol_continue-members.html | 19 +- .../classmo_no_fit_impr_sol_continue.html | 21 +- .../html/classmo_no_fit_impr_sol_continue.png | Bin 583 -> 583 bytes .../classmo_rand_impr_select-members.html | 10 +- .../doc/html/classmo_rand_impr_select.html | 15 +- .../doc/html/classmo_rand_impr_select.png | Bin 1076 -> 517 bytes .../doc/html/classmo_rand_move.html | 15 +- .../doc/html/classmo_s_a-members.html | 17 +- trunk/paradiseo-mo/doc/html/classmo_s_a.html | 23 +- trunk/paradiseo-mo/doc/html/classmo_s_a.png | Bin 1521 -> 462 bytes ...classmo_simple_move_tabu_list-members.html | 10 +- .../html/classmo_simple_move_tabu_list.html | 13 +- .../html/classmo_simple_move_tabu_list.png | Bin 1368 -> 539 bytes ...smo_simple_solution_tabu_list-members.html | 10 +- .../classmo_simple_solution_tabu_list.html | 13 +- .../classmo_simple_solution_tabu_list.png | Bin 1376 -> 553 bytes .../html/classmo_sol_continue-members.html | 9 +- .../doc/html/classmo_sol_continue.html | 18 +- .../doc/html/classmo_sol_continue.png | Bin 913 -> 1264 bytes ...assmo_steady_fit_sol_continue-members.html | 19 +- .../html/classmo_steady_fit_sol_continue.html | 21 +- .../html/classmo_steady_fit_sol_continue.png | Bin 592 -> 592 bytes .../doc/html/classmo_t_s-members.html | 17 +- trunk/paradiseo-mo/doc/html/classmo_t_s.html | 25 +- trunk/paradiseo-mo/doc/html/classmo_t_s.png | Bin 1503 -> 457 bytes .../classmo_t_s_move_loop_expl-members.html | 10 +- .../doc/html/classmo_t_s_move_loop_expl.html | 15 +- .../doc/html/classmo_t_s_move_loop_expl.png | Bin 1577 -> 659 bytes .../doc/html/classmo_tabu_list-members.html | 9 +- .../doc/html/classmo_tabu_list.html | 17 +- .../doc/html/classmo_tabu_list.png | Bin 1770 -> 890 bytes .../doc/html/edge__xover_8cpp-source.html | 172 +++ .../doc/html/edge__xover_8h-source.html | 76 + trunk/paradiseo-mo/doc/html/files.html | 54 +- trunk/paradiseo-mo/doc/html/functions.html | 140 +- .../paradiseo-mo/doc/html/functions_func.html | 42 +- .../paradiseo-mo/doc/html/functions_type.html | 18 +- .../paradiseo-mo/doc/html/functions_vars.html | 66 +- .../doc/html/graph_8cpp-source.html | 120 ++ .../doc/html/graph_8h-source.html | 60 + trunk/paradiseo-mo/doc/html/hierarchy.html | 133 +- .../doc/html/hill__climbing_8cpp-source.html | 97 ++ trunk/paradiseo-mo/doc/html/index.html | 2 +- .../doc/html/index_8h-source.html | 5 +- trunk/paradiseo-mo/doc/html/installdox | 2 +- .../iterated__local__search_8cpp-source.html | 125 ++ trunk/paradiseo-mo/doc/html/main.html | 17 +- .../paradiseo-mo/doc/html/mix_8h-source.html | 55 + trunk/paradiseo-mo/doc/html/mo_8h-source.html | 5 +- .../doc/html/mo_algo_8h-source.html | 7 +- .../doc/html/mo_aspir_crit_8h-source.html | 7 +- .../html/mo_best_impr_select_8h-source.html | 5 +- .../doc/html/mo_comparator_8h-source.html | 52 + .../html/mo_cooling_schedule_8h-source.html | 7 +- ...xponential_cooling_schedule_8h-source.html | 5 +- .../html/mo_first_impr_select_8h-source.html | 5 +- .../doc/html/mo_fit_comparator_8h-source.html | 56 + .../html/mo_fit_sol_continue_8h-source.html | 30 +- .../html/mo_gen_sol_continue_8h-source.html | 5 +- .../doc/html/mo_h_c_8h-source.html | 5 +- .../html/mo_h_c_move_loop_expl_8h-source.html | 5 +- .../doc/html/mo_i_l_s_8h-source.html | 156 ++ ...mo_impr_best_fit_aspir_crit_8h-source.html | 5 +- .../html/mo_it_rand_next_move_8h-source.html | 5 +- .../html/mo_l_s_check_point_8h-source.html | 9 +- .../mo_linear_cooling_schedule_8h-source.html | 5 +- .../doc/html/mo_move_8h-source.html | 7 +- .../doc/html/mo_move_expl_8h-source.html | 7 +- .../doc/html/mo_move_incr_eval_8h-source.html | 7 +- .../doc/html/mo_move_init_8h-source.html | 7 +- .../doc/html/mo_move_loop_expl_8h-source.html | 5 +- .../doc/html/mo_move_select_8h-source.html | 7 +- .../doc/html/mo_next_move_8h-source.html | 7 +- .../doc/html/mo_no_aspir_crit_8h-source.html | 5 +- ...mo_no_fit_impr_sol_continue_8h-source.html | 60 +- .../html/mo_rand_impr_select_8h-source.html | 7 +- .../doc/html/mo_rand_move_8h-source.html | 7 +- .../doc/html/mo_s_a_8h-source.html | 7 +- .../mo_simple_move_tabu_list_8h-source.html | 5 +- ...o_simple_solution_tabu_list_8h-source.html | 5 +- .../doc/html/mo_sol_continue_8h-source.html | 7 +- .../mo_steady_fit_sol_continue_8h-source.html | 76 +- .../doc/html/mo_t_s_8h-source.html | 5 +- .../html/mo_t_s_move_loop_expl_8h-source.html | 5 +- .../doc/html/mo_tabu_list_8h-source.html | 7 +- .../doc/html/namespace_graph.html | 63 + .../doc/html/namespacemembers.html | 59 + .../doc/html/namespacemembers_func.html | 55 + .../doc/html/namespacemembers_vars.html | 51 + trunk/paradiseo-mo/doc/html/namespaces.html | 39 + .../doc/html/order__xover_8cpp-source.html | 124 ++ .../doc/html/order__xover_8h-source.html | 61 + .../html/part__route__eval_8cpp-source.html | 57 + .../doc/html/part__route__eval_8h-source.html | 65 + .../part__two__opt__init_8cpp-source.html | 50 + .../html/part__two__opt__init_8h-source.html | 58 + .../part__two__opt__next_8cpp-source.html | 62 + .../html/part__two__opt__next_8h-source.html | 57 + .../partial__mapped__xover_8cpp-source.html | 123 ++ .../partial__mapped__xover_8h-source.html | 60 + .../doc/html/route_8h-source.html | 49 + .../doc/html/route__eval_8cpp-source.html | 56 + .../doc/html/route__eval_8h-source.html | 59 + .../doc/html/route__init_8cpp-source.html | 68 + .../doc/html/route__init_8h-source.html | 58 + .../doc/html/route__valid_8cpp-source.html | 73 + .../doc/html/route__valid_8h-source.html | 49 + trunk/paradiseo-mo/doc/html/search.idx | Bin 341761 -> 384510 bytes trunk/paradiseo-mo/doc/html/search.php | 3 +- .../simulated__annealing_8cpp-source.html | 97 ++ .../doc/html/t-mo_8cpp-source.html | 54 + .../doc/html/tabu__search_8cpp-source.html | 100 ++ trunk/paradiseo-mo/doc/html/tree.html | 271 ++-- .../doc/html/two__opt_8cpp-source.html | 77 + .../doc/html/two__opt_8h-source.html | 66 + .../two__opt__incr__eval_8cpp-source.html | 58 + .../html/two__opt__incr__eval_8h-source.html | 57 + .../doc/html/two__opt__init_8cpp-source.html | 48 + .../doc/html/two__opt__init_8h-source.html | 58 + .../doc/html/two__opt__next_8cpp-source.html | 62 + .../doc/html/two__opt__next_8h-source.html | 57 + .../doc/html/two__opt__rand_8cpp-source.html | 50 + .../doc/html/two__opt__rand_8h-source.html | 58 + .../two__opt__tabu__list_8cpp-source.html | 88 ++ .../html/two__opt__tabu__list_8h-source.html | 67 + trunk/paradiseo-mo/doc/latex/annotated.tex | 23 +- .../doc/latex/class_city_swap.tex | 26 + .../doc/latex/class_edge_xover.tex | 47 + .../doc/latex/class_order_xover.tex | 32 + .../doc/latex/class_part_route_eval.tex | 38 + .../doc/latex/class_part_two_opt_init.eps | 197 +++ .../doc/latex/class_part_two_opt_init.tex | 32 + .../doc/latex/class_part_two_opt_next.eps | 197 +++ .../doc/latex/class_part_two_opt_next.tex | 25 + .../doc/latex/class_partial_mapped_xover.tex | 32 + .../doc/latex/class_route_eval.tex | 26 + .../doc/latex/class_route_init.tex | 21 + .../paradiseo-mo/doc/latex/class_two_opt.eps | 197 +++ .../paradiseo-mo/doc/latex/class_two_opt.tex | 36 + .../doc/latex/class_two_opt_incr_eval.eps | 197 +++ .../doc/latex/class_two_opt_incr_eval.tex | 27 + .../doc/latex/class_two_opt_init.eps | 197 +++ .../doc/latex/class_two_opt_init.tex | 32 + .../doc/latex/class_two_opt_next.eps | 197 +++ .../doc/latex/class_two_opt_next.tex | 33 + .../doc/latex/class_two_opt_rand.eps | 197 +++ .../doc/latex/class_two_opt_rand.tex | 27 + .../doc/latex/class_two_opt_tabu_list.eps | 197 +++ .../doc/latex/class_two_opt_tabu_list.tex | 76 + trunk/paradiseo-mo/doc/latex/classmo_algo.tex | 6 - .../doc/latex/classmo_aspir_crit.eps | 18 +- .../doc/latex/classmo_aspir_crit.tex | 2 +- .../doc/latex/classmo_best_impr_select.eps | 18 +- .../doc/latex/classmo_best_impr_select.tex | 6 +- .../doc/latex/classmo_comparator.eps | 197 +++ .../doc/latex/classmo_comparator.tex | 29 + .../doc/latex/classmo_cooling_schedule.eps | 18 +- .../doc/latex/classmo_cooling_schedule.tex | 2 +- .../classmo_exponential_cooling_schedule.eps | 18 +- .../classmo_exponential_cooling_schedule.tex | 6 +- .../doc/latex/classmo_first_impr_select.eps | 18 +- .../doc/latex/classmo_first_impr_select.tex | 6 +- .../doc/latex/classmo_fit_comparator.eps | 197 +++ .../doc/latex/classmo_fit_comparator.tex | 35 + .../doc/latex/classmo_fit_sol_continue.tex | 48 +- .../doc/latex/classmo_gen_sol_continue.eps | 18 +- .../doc/latex/classmo_gen_sol_continue.tex | 6 +- trunk/paradiseo-mo/doc/latex/classmo_h_c.eps | 40 +- trunk/paradiseo-mo/doc/latex/classmo_h_c.tex | 16 +- .../doc/latex/classmo_h_c_move_loop_expl.eps | 18 +- .../doc/latex/classmo_h_c_move_loop_expl.tex | 6 +- .../paradiseo-mo/doc/latex/classmo_i_l_s.eps | 197 +++ .../paradiseo-mo/doc/latex/classmo_i_l_s.tex | 153 ++ .../classmo_impr_best_fit_aspir_crit.eps | 18 +- .../classmo_impr_best_fit_aspir_crit.tex | 6 +- .../doc/latex/classmo_it_rand_next_move.eps | 18 +- .../doc/latex/classmo_it_rand_next_move.tex | 8 +- .../doc/latex/classmo_l_s_check_point.tex | 12 +- .../latex/classmo_linear_cooling_schedule.eps | 18 +- .../latex/classmo_linear_cooling_schedule.tex | 6 +- trunk/paradiseo-mo/doc/latex/classmo_move.tex | 6 - .../doc/latex/classmo_move_expl.eps | 18 +- .../doc/latex/classmo_move_expl.tex | 2 +- .../doc/latex/classmo_move_incr_eval.tex | 6 - .../doc/latex/classmo_move_init.tex | 6 - .../doc/latex/classmo_move_loop_expl.eps | 18 +- .../doc/latex/classmo_move_loop_expl.tex | 2 +- .../doc/latex/classmo_move_select.eps | 18 +- .../doc/latex/classmo_move_select.tex | 2 +- .../doc/latex/classmo_next_move.eps | 18 +- .../doc/latex/classmo_next_move.tex | 2 +- .../doc/latex/classmo_no_aspir_crit.eps | 18 +- .../doc/latex/classmo_no_aspir_crit.tex | 2 +- .../classmo_no_fit_impr_sol_continue.tex | 58 +- .../doc/latex/classmo_rand_impr_select.eps | 18 +- .../doc/latex/classmo_rand_impr_select.tex | 8 +- .../doc/latex/classmo_rand_move.tex | 6 - trunk/paradiseo-mo/doc/latex/classmo_s_a.eps | 40 +- trunk/paradiseo-mo/doc/latex/classmo_s_a.tex | 14 +- .../latex/classmo_simple_move_tabu_list.eps | 18 +- .../latex/classmo_simple_move_tabu_list.tex | 6 +- .../classmo_simple_solution_tabu_list.eps | 18 +- .../classmo_simple_solution_tabu_list.tex | 6 +- .../doc/latex/classmo_sol_continue.eps | 38 +- .../doc/latex/classmo_sol_continue.tex | 6 +- .../latex/classmo_steady_fit_sol_continue.tex | 64 +- trunk/paradiseo-mo/doc/latex/classmo_t_s.eps | 40 +- trunk/paradiseo-mo/doc/latex/classmo_t_s.tex | 16 +- .../doc/latex/classmo_t_s_move_loop_expl.eps | 18 +- .../doc/latex/classmo_t_s_move_loop_expl.tex | 6 +- .../doc/latex/classmo_tabu_list.eps | 18 +- .../doc/latex/classmo_tabu_list.tex | 6 +- trunk/paradiseo-mo/doc/latex/doxygen.sty | 4 +- trunk/paradiseo-mo/doc/latex/hierarchy.tex | 107 +- trunk/paradiseo-mo/doc/latex/main.tex | 10 +- .../doc/latex/namespace_graph.tex | 28 + trunk/paradiseo-mo/doc/latex/namespaces.tex | 4 + trunk/paradiseo-mo/doc/latex/refman.tex | 37 +- .../doc/man/man3/EmptySelection.3 | 4 +- trunk/paradiseo-mo/doc/man/man3/moAlgo.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 | 6 +- .../doc/man/man3/moBestImprSelect.3 | 8 +- .../doc/man/man3/moCoolingSchedule.3 | 6 +- .../man/man3/moExponentialCoolingSchedule.3 | 8 +- .../doc/man/man3/moFirstImprSelect.3 | 8 +- .../doc/man/man3/moFitSolContinue.3 | 4 +- .../doc/man/man3/moGenSolContinue.3 | 8 +- trunk/paradiseo-mo/doc/man/man3/moHC.3 | 18 +- .../doc/man/man3/moHCMoveLoopExpl.3 | 8 +- .../doc/man/man3/moImprBestFitAspirCrit.3 | 8 +- .../doc/man/man3/moItRandNextMove.3 | 10 +- .../doc/man/man3/moLSCheckPoint.3 | 12 +- .../doc/man/man3/moLinearCoolingSchedule.3 | 8 +- trunk/paradiseo-mo/doc/man/man3/moMove.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 | 6 +- .../doc/man/man3/moMoveIncrEval.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 | 6 +- .../doc/man/man3/moMoveLoopExpl.3 | 4 +- .../paradiseo-mo/doc/man/man3/moMoveSelect.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moNextMove.3 | 6 +- .../paradiseo-mo/doc/man/man3/moNoAspirCrit.3 | 4 +- .../doc/man/man3/moNoFitImprSolContinue.3 | 4 +- .../doc/man/man3/moRandImprSelect.3 | 10 +- trunk/paradiseo-mo/doc/man/man3/moRandMove.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moSA.3 | 16 +- .../doc/man/man3/moSimpleMoveTabuList.3 | 8 +- .../doc/man/man3/moSimpleSolutionTabuList.3 | 8 +- .../paradiseo-mo/doc/man/man3/moSolContinue.3 | 12 +- .../doc/man/man3/moSteadyFitSolContinue.3 | 4 +- trunk/paradiseo-mo/doc/man/man3/moTS.3 | 18 +- .../doc/man/man3/moTSMoveLoopExpl.3 | 8 +- trunk/paradiseo-mo/doc/man/man3/moTabuList.3 | 10 +- trunk/paradiseo-mo/doc/mo.doxytag | 1342 +++++++++++++++++ trunk/paradiseo-mo/src/mo.h | 3 + trunk/paradiseo-mo/src/moComparator.h | 25 + trunk/paradiseo-mo/src/moFitComparator.h | 29 + trunk/paradiseo-mo/src/moILS.h | 185 +++ trunk/paradiseo-mo/tutorial/CMakeLists.txt | 2 +- .../tutorial/Lesson4/CMakeLists.txt | 81 + .../Lesson4/iterated_local_search.cpp | 95 ++ .../tutorial/examples/tsp/benchs/berlin52.tsp | 53 + 366 files changed, 12069 insertions(+), 1772 deletions(-) create mode 100644 trunk/paradiseo-mo/doc/html/city__swap_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/city__swap_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/class_city_swap-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_city_swap.html create mode 100644 trunk/paradiseo-mo/doc/html/class_edge_xover-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_edge_xover.html create mode 100644 trunk/paradiseo-mo/doc/html/class_order_xover-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_order_xover.html create mode 100644 trunk/paradiseo-mo/doc/html/class_part_route_eval-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_part_route_eval.html create mode 100644 trunk/paradiseo-mo/doc/html/class_part_two_opt_init-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_part_two_opt_init.html create mode 100644 trunk/paradiseo-mo/doc/html/class_part_two_opt_init.png create mode 100644 trunk/paradiseo-mo/doc/html/class_part_two_opt_next-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_part_two_opt_next.html create mode 100644 trunk/paradiseo-mo/doc/html/class_part_two_opt_next.png create mode 100644 trunk/paradiseo-mo/doc/html/class_partial_mapped_xover-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_partial_mapped_xover.html create mode 100644 trunk/paradiseo-mo/doc/html/class_route_eval-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_route_eval.html create mode 100644 trunk/paradiseo-mo/doc/html/class_route_init-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_route_init.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt.png create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval.png create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_init-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_init.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_init.png create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_next-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_next.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_next.png create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_rand-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_rand.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_rand.png create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list-members.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.html create mode 100644 trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.png create mode 100644 trunk/paradiseo-mo/doc/html/classmo_comparator.html create mode 100644 trunk/paradiseo-mo/doc/html/classmo_comparator.png create mode 100644 trunk/paradiseo-mo/doc/html/classmo_fit_comparator-members.html create mode 100644 trunk/paradiseo-mo/doc/html/classmo_fit_comparator.html create mode 100644 trunk/paradiseo-mo/doc/html/classmo_fit_comparator.png create mode 100644 trunk/paradiseo-mo/doc/html/classmo_i_l_s-members.html create mode 100644 trunk/paradiseo-mo/doc/html/classmo_i_l_s.html create mode 100644 trunk/paradiseo-mo/doc/html/classmo_i_l_s.png create mode 100644 trunk/paradiseo-mo/doc/html/edge__xover_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/edge__xover_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/graph_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/graph_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/hill__climbing_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/iterated__local__search_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/mix_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/mo_comparator_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/mo_fit_comparator_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/mo_i_l_s_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/namespace_graph.html create mode 100644 trunk/paradiseo-mo/doc/html/namespacemembers.html create mode 100644 trunk/paradiseo-mo/doc/html/namespacemembers_func.html create mode 100644 trunk/paradiseo-mo/doc/html/namespacemembers_vars.html create mode 100644 trunk/paradiseo-mo/doc/html/namespaces.html create mode 100644 trunk/paradiseo-mo/doc/html/order__xover_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/order__xover_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/part__route__eval_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/part__route__eval_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/part__two__opt__init_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/part__two__opt__init_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/part__two__opt__next_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/part__two__opt__next_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/partial__mapped__xover_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/partial__mapped__xover_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/route_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/route__eval_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/route__eval_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/route__init_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/route__init_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/route__valid_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/route__valid_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/simulated__annealing_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/t-mo_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/tabu__search_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt__init_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt__init_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt__next_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt__next_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt__rand_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt__rand_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8cpp-source.html create mode 100644 trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8h-source.html create mode 100644 trunk/paradiseo-mo/doc/latex/class_city_swap.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_edge_xover.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_order_xover.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_part_route_eval.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.eps create mode 100644 trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.eps create mode 100644 trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_partial_mapped_xover.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_route_eval.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_route_init.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt.eps create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.eps create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt_init.eps create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt_init.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt_next.eps create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt_next.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt_rand.eps create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt_rand.tex create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.eps create mode 100644 trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.tex create mode 100644 trunk/paradiseo-mo/doc/latex/classmo_comparator.eps create mode 100644 trunk/paradiseo-mo/doc/latex/classmo_comparator.tex create mode 100644 trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.eps create mode 100644 trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.tex create mode 100644 trunk/paradiseo-mo/doc/latex/classmo_i_l_s.eps create mode 100644 trunk/paradiseo-mo/doc/latex/classmo_i_l_s.tex create mode 100644 trunk/paradiseo-mo/doc/latex/namespace_graph.tex create mode 100644 trunk/paradiseo-mo/doc/latex/namespaces.tex create mode 100644 trunk/paradiseo-mo/doc/mo.doxytag create mode 100644 trunk/paradiseo-mo/src/moComparator.h create mode 100644 trunk/paradiseo-mo/src/moFitComparator.h create mode 100644 trunk/paradiseo-mo/src/moILS.h create mode 100644 trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt create mode 100644 trunk/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp create mode 100644 trunk/paradiseo-mo/tutorial/examples/tsp/benchs/berlin52.tsp diff --git a/trunk/paradiseo-mo/doc/html/annotated.html b/trunk/paradiseo-mo/doc/html/annotated.html index 9409c33f8..eabe149c6 100644 --- a/trunk/paradiseo-mo/doc/html/annotated.html +++ b/trunk/paradiseo-mo/doc/html/annotated.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Class List +ParadisEO-MOMovingObjects: Class List @@ -8,6 +8,7 @@
-

PARADISEO-MO Class List

Here are the classes, structs, unions and interfaces with brief descriptions: +

ParadisEO-MOMovingObjects Class List

Here are the classes, structs, unions and interfaces with brief descriptions:
+ + + + + + @@ -53,17 +60,32 @@ + + + + + + + + + + + + + + +
CitySwapIts swaps two vertices randomly choosen
EdgeXoverEdge Crossover
EmptySelectionSpecial class that describes the case of no selection
moAlgo< EOT >Description of an algorithm of the paradiseo-mo library
moAspirCrit< M >Description of the conditions in which a tabu move could be accepted
moBestImprSelect< M >One of the possible moMoveSelect
moComparator< EOT >Template for classes which need to compare two EOT and indicate if the first is "better" than the second
moCoolingScheduleThis class gives the description of a cooling schedule
moExponentialCoolingScheduleOne of the possible moCoolingSchedule
moFirstImprSelect< M >One possible moMoveSelect
moFitComparator< EOT >Comparison according to the fitness
moFitSolContinue< EOT >One possible stop criterion for a solution-based heuristic
moGenSolContinue< EOT >One possible stop criterion for a solution-based heuristic
moHC< M >Hill Climbing (HC)
moHCMoveLoopExpl< M >Iterative explorer used by a moHC
moILS< M >Iterated Local Search (ILS)
moImprBestFitAspirCrit< M >One of the possible moAspirCrit
moItRandNextMove< M >One of the possible moNextMove
moLinearCoolingScheduleOne of the possible moCoolingSchedule
moMoveSelect< M >Class that describes a move selector (moMove)
moNextMove< M >Class which allows to generate a new move (moMove)
moNoAspirCrit< M >One of the possible aspiration criterion (moAspirCrit)
moNoFitImprSolContinue< EOT >One possible stop criterion for a solution-based heuristic
moRandImprSelect< M >One of the possible moMove selector (moMoveSelect)
moRandMove< M >Random move generator
moSA< M >Simulated Annealing (SA)
moSimpleMoveTabuList< M >Class describing a move tabu list with a limited memory
moSimpleSolutionTabuList< M >Class describing a solution tabu list with limited length
moSolContinue< EOT >Class that describes a stop criterion for a solution-based heuristic
moSteadyFitSolContinue< EOT >One possible stopping criterion for a solution-based heuristic
moTabuList< M >Class describing a tabu list that a moTS uses
moTS< M >Tabu Search (TS)
moTSMoveLoopExpl< M >Explorer for a Tabu Search algorithm
OrderXoverOrder Crossover
PartialMappedXoverPartial Mapped Crossover
PartRouteEvalRoute Evaluator
PartTwoOptInitIt sets the first couple of edges
PartTwoOptNextIt updates a couple of edges
RouteEvalRoute Evaluator
RouteInit
TwoOpt
TwoOptIncrEval
TwoOptInitIt sets the first couple of edges
TwoOptNextIt updates a couple of edges
TwoOptRand
TwoOptTabuListThe table of tabu movements, i.e
-
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/city__swap_8cpp-source.html b/trunk/paradiseo-mo/doc/html/city__swap_8cpp-source.html new file mode 100644 index 000000000..e0b1a7e09 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/city__swap_8cpp-source.html @@ -0,0 +1,54 @@ + + +ParadisEO-MOMovingObjects: city_swap.cpp Source File + + + + +
+ +
+

city_swap.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "city_swap.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2002-2006
+00006 
+00007 /* TEXT LICENCE
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include <utils/eoRNG.h>
+00013 
+00014 #include "city_swap.h"
+00015 
+00016 bool CitySwap :: operator () (Route & __route) {
+00017   
+00018   std :: swap (__route [rng.random (__route.size ())],
+00019                __route [rng.random (__route.size ())]) ;
+00020     
+00021   __route.invalidate () ;
+00022   
+00023   return true ;
+00024 }
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/city__swap_8h-source.html b/trunk/paradiseo-mo/doc/html/city__swap_8h-source.html new file mode 100644 index 000000000..3cd00292e --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/city__swap_8h-source.html @@ -0,0 +1,57 @@ + + +ParadisEO-MOMovingObjects: city_swap.h Source File + + + + +
+ +
+

city_swap.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "city_swap.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2002-2006
+00006 
+00007 /* TEXT LICENCE
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef city_swap_h
+00013 #define city_swap_h
+00014 
+00015 #include <eoOp.h>
+00016 
+00017 #include "route.h"
+00018 
+00021 class CitySwap : public eoMonOp <Route> {
+00022   
+00023 public :
+00024   
+00025   bool operator () (Route & __route) ;
+00026     
+00027 } ;
+00028 
+00029 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/class_city_swap-members.html b/trunk/paradiseo-mo/doc/html/class_city_swap-members.html new file mode 100644 index 000000000..485ee47fa --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_city_swap-members.html @@ -0,0 +1,40 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
+ +
+
+ +
+

CitySwap Member List

This is the complete list of members for CitySwap, including all inherited members.

+ +
operator()(Route &__route)CitySwap

Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/class_city_swap.html b/trunk/paradiseo-mo/doc/html/class_city_swap.html new file mode 100644 index 000000000..765bf1059 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_city_swap.html @@ -0,0 +1,57 @@ + + +ParadisEO-MOMovingObjects: CitySwap Class Reference + + + + +
+ +
+
+ +
+

CitySwap Class Reference

Its swaps two vertices randomly choosen. +More... +

+#include <city_swap.h> +

+List of all members. + + + + +

Public Member Functions

+bool operator() (Route &__route)
+

Detailed Description

+Its swaps two vertices randomly choosen. +

+ +

+Definition at line 21 of file city_swap.h.

The documentation for this class was generated from the following files: +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/class_edge_xover-members.html b/trunk/paradiseo-mo/doc/html/class_edge_xover-members.html new file mode 100644 index 000000000..44eb22657 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_edge_xover-members.html @@ -0,0 +1,45 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
+ +
+
+ +
+

EdgeXover Member List

This is the complete list of members for EdgeXover, including all inherited members.

+ + + + + + +
_mapEdgeXover [private]
add_vertex(unsigned int __vertex, Route &__child)EdgeXover [private]
build_map(const Route &__par1, const Route &__par2)EdgeXover [private]
cross(const Route &__par1, const Route &__par2, Route &__child)EdgeXover [private]
operator()(Route &__route1, Route &__route2)EdgeXover
visitedEdgeXover [private]

Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/class_edge_xover.html b/trunk/paradiseo-mo/doc/html/class_edge_xover.html new file mode 100644 index 000000000..e052fb730 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_edge_xover.html @@ -0,0 +1,75 @@ + + +ParadisEO-MOMovingObjects: EdgeXover Class Reference + + + + +
+ +
+
+ +
+

EdgeXover Class Reference

Edge Crossover. +More... +

+#include <edge_xover.h> +

+List of all members. + + + + + + + + + + + + + + + + +

Public Member Functions

+bool operator() (Route &__route1, Route &__route2)

Private Member Functions

+void cross (const Route &__par1, const Route &__par2, Route &__child)
+void build_map (const Route &__par1, const Route &__par2)
+void add_vertex (unsigned int __vertex, Route &__child)

Private Attributes

+std::vector< std::set< unsigned
+int > > 		_map
+std::vector< bool > visited
+

Detailed Description

+Edge Crossover. +

+ +

+Definition at line 23 of file edge_xover.h.

The documentation for this class was generated from the following files: +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/class_empty_selection.html b/trunk/paradiseo-mo/doc/html/class_empty_selection.html index 27239f582..4cd26fe1e 100644 --- a/trunk/paradiseo-mo/doc/html/class_empty_selection.html +++ b/trunk/paradiseo-mo/doc/html/class_empty_selection.html @@ -1,6 +1,6 @@ -PARADISEO-MO: EmptySelection Class Reference +ParadisEO-MOMovingObjects: EmptySelection Class Reference @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -47,7 +48,7 @@ This class is used as an exception that can be thrown if a solution selector has

    Definition at line 21 of file moMoveSelect.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/class_order_xover-members.html b/trunk/paradiseo-mo/doc/html/class_order_xover-members.html new file mode 100644 index 000000000..22901f4ad --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_order_xover-members.html @@ -0,0 +1,41 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    OrderXover Member List

    This is the complete list of members for OrderXover, including all inherited members.

    + + +
    cross(const Route &__par1, const Route &__par2, Route &__child)OrderXover [private]
    operator()(Route &__route1, Route &__route2)OrderXover

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_order_xover.html b/trunk/paradiseo-mo/doc/html/class_order_xover.html new file mode 100644 index 000000000..c7e4617ae --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_order_xover.html @@ -0,0 +1,61 @@ + + +ParadisEO-MOMovingObjects: OrderXover Class Reference + + + + +
    + +
    +
    + +
    +

    OrderXover Class Reference

    Order Crossover. +More... +

    +#include <order_xover.h> +

    +List of all members. + + + + + + + +

    Public Member Functions

    +bool operator() (Route &__route1, Route &__route2)

    Private Member Functions

    +void cross (const Route &__par1, const Route &__par2, Route &__child)
    +

    Detailed Description

    +Order Crossover. +

    + +

    +Definition at line 20 of file order_xover.h.

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_part_route_eval-members.html b/trunk/paradiseo-mo/doc/html/class_part_route_eval-members.html new file mode 100644 index 000000000..50b2c8dc2 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_part_route_eval-members.html @@ -0,0 +1,43 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    PartRouteEval Member List

    This is the complete list of members for PartRouteEval, including all inherited members.

    + + + + +
    fromPartRouteEval [private]
    operator()(Route &__route)PartRouteEval
    PartRouteEval(float __from, float __to)PartRouteEval
    toPartRouteEval [private]

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_part_route_eval.html b/trunk/paradiseo-mo/doc/html/class_part_route_eval.html new file mode 100644 index 000000000..9cbb0d16a --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_part_route_eval.html @@ -0,0 +1,68 @@ + + +ParadisEO-MOMovingObjects: PartRouteEval Class Reference + + + + +
    + +
    +
    + +
    +

    PartRouteEval Class Reference

    Route Evaluator. +More... +

    +#include <part_route_eval.h> +

    +List of all members. + + + + + + + + + + + + +

    Public Member Functions

    + PartRouteEval (float __from, float __to)
     Constructor.
    +void operator() (Route &__route)

    Private Attributes

    +float from
    +float to
    +

    Detailed Description

    +Route Evaluator. +

    + +

    +Definition at line 20 of file part_route_eval.h.

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_part_two_opt_init-members.html b/trunk/paradiseo-mo/doc/html/class_part_two_opt_init-members.html new file mode 100644 index 000000000..0237867ea --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_part_two_opt_init-members.html @@ -0,0 +1,40 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    PartTwoOptInit Member List

    This is the complete list of members for PartTwoOptInit, including all inherited members.

    + +
    operator()(TwoOpt &__move, const Route &__route)PartTwoOptInit

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_part_two_opt_init.html b/trunk/paradiseo-mo/doc/html/class_part_two_opt_init.html new file mode 100644 index 000000000..43d20724c --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_part_two_opt_init.html @@ -0,0 +1,62 @@ + + +ParadisEO-MOMovingObjects: PartTwoOptInit Class Reference + + + + +
    + +
    +
    + +
    +

    PartTwoOptInit Class Reference

    It sets the first couple of edges. +More... +

    +#include <part_two_opt_init.h> +

    +

    Inheritance diagram for PartTwoOptInit: +

    + +moMoveInit< TwoOpt > + +List of all members. + + + + +

    Public Member Functions

    +void operator() (TwoOpt &__move, const Route &__route)
    +

    Detailed Description

    +It sets the first couple of edges. +

    + +

    +Definition at line 20 of file part_two_opt_init.h.

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_part_two_opt_init.png b/trunk/paradiseo-mo/doc/html/class_part_two_opt_init.png new file mode 100644 index 0000000000000000000000000000000000000000..8bf08d7fb205fb69a0bf2005777e82786fbd54c8 GIT binary patch literal 470 zcmV;{0V)28P)5unrsH&wV=R#T(1(n}*Bto>pJj?H&_PhPyPwmL zbcTqjnh=}E0}wglJ*YUS-y_@V9Vqjz84bh=U;IckWUO!NMS-QF#ulT35;7_gFsoAR zfjoGe22x`&qvqitb$2-QxgQYiqBC(gKW;xK}r4Oe}Qgffkr^nK1Ty`8FBhk(DnOd zpv(1oGSCUTwm=KCKnt`$3-mT1oFg&BIZ-drFF=6k8mZW=t78P2ZT8=Sg0D199ian- zK@jZ@AV)(kK%qncQYjc@>j(&Fgb2YwQR9fbMnB}?bwpAZL1{knl7YJENNW7InFE3@ zB9bYfP%CbAJD6JJ-J^rJMIfD|h8pN)*Y*Ti_@% literal 0 HcmV?d00001 diff --git a/trunk/paradiseo-mo/doc/html/class_part_two_opt_next-members.html b/trunk/paradiseo-mo/doc/html/class_part_two_opt_next-members.html new file mode 100644 index 000000000..7edbdd77c --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_part_two_opt_next-members.html @@ -0,0 +1,39 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    PartTwoOptNext Member List

    This is the complete list of members for PartTwoOptNext, including all inherited members.

    +

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_part_two_opt_next.html b/trunk/paradiseo-mo/doc/html/class_part_two_opt_next.html new file mode 100644 index 000000000..43c15c38d --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_part_two_opt_next.html @@ -0,0 +1,58 @@ + + +ParadisEO-MOMovingObjects: PartTwoOptNext Class Reference + + + + +
    + +
    +
    + +
    +

    PartTwoOptNext Class Reference

    It updates a couple of edges. +More... +

    +#include <part_two_opt_next.h> +

    +

    Inheritance diagram for PartTwoOptNext: +

    + +moNextMove< TwoOpt > + +List of all members. + +
    +

    Detailed Description

    +It updates a couple of edges. +

    + +

    +Definition at line 19 of file part_two_opt_next.h.

    The documentation for this class was generated from the following file: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_part_two_opt_next.png b/trunk/paradiseo-mo/doc/html/class_part_two_opt_next.png new file mode 100644 index 0000000000000000000000000000000000000000..087d183ebc70b14911367fb027fde9f981fbe854 GIT binary patch literal 512 zcmV+b0{{JqP)^l~@x zZ`y_vB32W7K1Z!#se+--cb00G4qzlY2<1+4mq{`hzgz~Ug`h*CWkw|K3YL&Gg0kK9 zVkgZDRCGE_7X_BAAh^IZxj;ln-oq%(dn?g7dw|n6FxH0XFe0bO*0I#@KbX+=uvF$X zEayrYQJb=iRuBvKVu_flW~FSleq1x_Pw6J5rHy>m-82l^IV0)#;W>N4sGfW-Y-I!X z46N&?uFYvnU%25i6vY`_L=z|^p#h1gF%4A|>1;GVb#IQz10 zfe|FBB%i@TSy?=Vcxr_BAdFRjNbv!vc@cnJ0G@yxsUr41Ov9sMbwu5qhyo#MlDenL zv`&h%y+u#;m&CFXuxXp}7rO^zZHUb + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    PartialMappedXover Member List

    This is the complete list of members for PartialMappedXover, including all inherited members.

    + + +
    operator()(Route &__route1, Route &__route2)PartialMappedXover
    repair(Route &__route, unsigned __cut1, unsigned __cut2)PartialMappedXover [private]

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_partial_mapped_xover.html b/trunk/paradiseo-mo/doc/html/class_partial_mapped_xover.html new file mode 100644 index 000000000..9f24eb0c7 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_partial_mapped_xover.html @@ -0,0 +1,61 @@ + + +ParadisEO-MOMovingObjects: PartialMappedXover Class Reference + + + + +
    + +
    +
    + +
    +

    PartialMappedXover Class Reference

    Partial Mapped Crossover. +More... +

    +#include <partial_mapped_xover.h> +

    +List of all members. + + + + + + + +

    Public Member Functions

    +bool operator() (Route &__route1, Route &__route2)

    Private Member Functions

    +void repair (Route &__route, unsigned __cut1, unsigned __cut2)
    +

    Detailed Description

    +Partial Mapped Crossover. +

    + +

    +Definition at line 20 of file partial_mapped_xover.h.

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_route_eval-members.html b/trunk/paradiseo-mo/doc/html/class_route_eval-members.html new file mode 100644 index 000000000..9fff4c3f2 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_route_eval-members.html @@ -0,0 +1,40 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    RouteEval Member List

    This is the complete list of members for RouteEval, including all inherited members.

    + +
    operator()(Route &__route)RouteEval

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_route_eval.html b/trunk/paradiseo-mo/doc/html/class_route_eval.html new file mode 100644 index 000000000..0cb37ea1d --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_route_eval.html @@ -0,0 +1,57 @@ + + +ParadisEO-MOMovingObjects: RouteEval Class Reference + + + + +
    + +
    +
    + +
    +

    RouteEval Class Reference

    Route Evaluator. +More... +

    +#include <route_eval.h> +

    +List of all members. + + + + +

    Public Member Functions

    +void operator() (Route &__route)
    +

    Detailed Description

    +Route Evaluator. +

    + +

    +Definition at line 20 of file route_eval.h.

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_route_init-members.html b/trunk/paradiseo-mo/doc/html/class_route_init-members.html new file mode 100644 index 000000000..3e18fc9ce --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_route_init-members.html @@ -0,0 +1,40 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    RouteInit Member List

    This is the complete list of members for RouteInit, including all inherited members.

    + +
    operator()(Route &__route)RouteInit

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_route_init.html b/trunk/paradiseo-mo/doc/html/class_route_init.html new file mode 100644 index 000000000..3a7487bf0 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_route_init.html @@ -0,0 +1,52 @@ + + +ParadisEO-MOMovingObjects: RouteInit Class Reference + + + + +
    + +
    +
    + +
    +

    RouteInit Class Reference

    List of all members. + + + + +

    Public Member Functions

    +void operator() (Route &__route)
    +

    Detailed Description

    + +

    + +

    +Definition at line 19 of file route_init.h.

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt-members.html b/trunk/paradiseo-mo/doc/html/class_two_opt-members.html new file mode 100644 index 000000000..63a18b1b1 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_two_opt-members.html @@ -0,0 +1,44 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    TwoOpt Member List

    This is the complete list of members for TwoOpt, including all inherited members.

    + + + + + +
    EOType typedefmoMove< Route >
    operator!() constTwoOpt
    operator()(Route &__route)TwoOpt
    printOn(std::ostream &__os) constTwoOpt
    readFrom(std::istream &__is)TwoOpt

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt.html b/trunk/paradiseo-mo/doc/html/class_two_opt.html new file mode 100644 index 000000000..451cd6c54 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_two_opt.html @@ -0,0 +1,66 @@ + + +ParadisEO-MOMovingObjects: TwoOpt Class Reference + + + + +
    + +
    +
    + +
    +

    TwoOpt Class Reference

    Inheritance diagram for TwoOpt: +

    + +moMove< Route > + +List of all members. + + + + + + + + + + +

    Public Member Functions

    +TwoOpt operator! () const
    +void operator() (Route &__route)
    +void readFrom (std::istream &__is)
    +void printOn (std::ostream &__os) const
    +

    Detailed Description

    + +

    + +

    +Definition at line 22 of file two_opt.h.

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt.png b/trunk/paradiseo-mo/doc/html/class_two_opt.png new file mode 100644 index 0000000000000000000000000000000000000000..fcdd436981a4d5a232110fa257ae15217bbffd9c GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^B|sd&!VDy>I(IaI@wkJ zS6<^#+LbirXrhvR;KsM=Pt6bR=}wJ{S@AqJ@KUxO(+shcfD|@A)vq&LJ5@XvteF3U zF<2xZkHcfa0uDL1pDaf?+uh$BTr71VBS&|URLlZ{H>QrxNqt6HVyw(8xij{yaEZKW zV`VnYrLkFM{Ue2FYc;cee32GS?9+Sj>c**GN0b0d*#@gnnOF7 zdA-+42YxpX3F)|1=y7o4UbYjrU;STgkyCCpCu{GMLoar{Yn>*)OkV!mm2-Cuw{8Xo O5QC?ypUXO@geCx+rJK6| literal 0 HcmV?d00001 diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval-members.html b/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval-members.html new file mode 100644 index 000000000..680249888 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval-members.html @@ -0,0 +1,40 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    TwoOptIncrEval Member List

    This is the complete list of members for TwoOptIncrEval, including all inherited members.

    + +
    operator()(const TwoOpt &__move, const Route &__route)TwoOptIncrEval

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval.html b/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval.html new file mode 100644 index 000000000..caeb82faa --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval.html @@ -0,0 +1,57 @@ + + +ParadisEO-MOMovingObjects: TwoOptIncrEval Class Reference + + + + +
    + +
    +
    + +
    +

    TwoOptIncrEval Class Reference

    Inheritance diagram for TwoOptIncrEval: +

    + +moMoveIncrEval< TwoOpt > + +List of all members. + + + + +

    Public Member Functions

    +float operator() (const TwoOpt &__move, const Route &__route)
    +

    Detailed Description

    + +

    + +

    +Definition at line 18 of file two_opt_incr_eval.h.

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval.png b/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval.png new file mode 100644 index 0000000000000000000000000000000000000000..adf2f029e029adcd43364047bdf38830c3ef0000 GIT binary patch literal 514 zcmV+d0{#7oP)jn2+bb~Gh#+F@zmH4)l;f~qIu^Xgl3H&k40=+>G`BooQGqDYe$@-`d_ksZaY3rw4vkVw>ui;2{O zYzq{EzLM#@!ntbI02Z#9xI@x-)5@K&!Sywy`6Z9bv3mH`#}_%c=JMv0gHX`QRgh#$ z&O7aL1>EN1G;MIPj+f}Ucs&7v!OBQp33YyRigiUJzqt%V5rWkNw}hTwvr<`SXoaNp zEBUGG;cKM4QU94+$>8?p_WI8sklPXGU%;K;FU7sh^QE|#tB1iI+`%2(!5!Se9bA>v zM*?&?S{&S;;PMBBV({pi+{m&CXvG^V6&_r-)n~ZYIBZa_#45xHA#$Jqpg{2X!`x^N z%n!g?lul^Dxv>S<$%BG27s{cK^+rJxaF#1QpC+^}>>iipGwzu@#HCqA7cMxLyR%&R z-dew057ENcda(MHIV+8)x%YDPR{mA)Q5oFc+)n@b50bDijc0>5KmY&$07*qoM6N<$ Ef+`yMaR2}S literal 0 HcmV?d00001 diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_init-members.html b/trunk/paradiseo-mo/doc/html/class_two_opt_init-members.html new file mode 100644 index 000000000..d25db0acc --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_init-members.html @@ -0,0 +1,40 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    TwoOptInit Member List

    This is the complete list of members for TwoOptInit, including all inherited members.

    + +
    operator()(TwoOpt &__move, const Route &__route)TwoOptInit

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_init.html b/trunk/paradiseo-mo/doc/html/class_two_opt_init.html new file mode 100644 index 000000000..274805872 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_init.html @@ -0,0 +1,62 @@ + + +ParadisEO-MOMovingObjects: TwoOptInit Class Reference + + + + +
    + +
    +
    + +
    +

    TwoOptInit Class Reference

    It sets the first couple of edges. +More... +

    +#include <two_opt_init.h> +

    +

    Inheritance diagram for TwoOptInit: +

    + +moMoveInit< TwoOpt > + +List of all members. + + + + +

    Public Member Functions

    +void operator() (TwoOpt &__move, const Route &__route)
    +

    Detailed Description

    +It sets the first couple of edges. +

    + +

    +Definition at line 20 of file two_opt_init.h.

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_init.png b/trunk/paradiseo-mo/doc/html/class_two_opt_init.png new file mode 100644 index 0000000000000000000000000000000000000000..c670a6b9ecb0c519a1b41506e1161249fa4a5639 GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^{XiVR!VDxYsai(?DTx4|5ZC|z{{xx-{~wq?KVbrp z1;z&s9H>6@{|S)GSQ6wH%;50sMjDXq=jq}YQZeW4RPUn03Oo*LeXn_#HwdTP;x2vq zTYjOCki5DdujXY7*&`Av%JaS^9y|S9VyB*bVuw$F`ia}Yw{0dyb$C>AZ>)IJa6>TP zQL*t=enoXP^QTXt{cJ+6Z8}FLAFqjGXLoZn_wM0R5)m=Huv#d`ac0mQwo7LdX3uhG zTKSvr#IhKHPnpJ*Dwo7WJVfJm&iSd@Chs`$i$qAx>yD0FN}J|v(N^6WvN-1bj{ghX zRz@y5VjQ70FSwf{bLt&sr{+6%7yB)|^&@^kuTKDX#*OzY9QAbl>bau!`?2j>^ZKNN z`kPxUz84_qc0)nWj-$PuRZa8Qj+%)m>n&Kvw@az1_m$R#OWcl@v{~r eUs!SfqIu_rzy7t}nF_#QX7F_Nb6Mw<&;$U{7r0jd literal 0 HcmV?d00001 diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_next-members.html b/trunk/paradiseo-mo/doc/html/class_two_opt_next-members.html new file mode 100644 index 000000000..214e29ef6 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_next-members.html @@ -0,0 +1,40 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    TwoOptNext Member List

    This is the complete list of members for TwoOptNext, including all inherited members.

    + +
    operator()(TwoOpt &__move, const Route &__route)TwoOptNext

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_next.html b/trunk/paradiseo-mo/doc/html/class_two_opt_next.html new file mode 100644 index 000000000..1947769e9 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_next.html @@ -0,0 +1,62 @@ + + +ParadisEO-MOMovingObjects: TwoOptNext Class Reference + + + + +
    + +
    +
    + +
    +

    TwoOptNext Class Reference

    It updates a couple of edges. +More... +

    +#include <two_opt_next.h> +

    +

    Inheritance diagram for TwoOptNext: +

    + +moNextMove< TwoOpt > + +List of all members. + + + + +

    Public Member Functions

    +bool operator() (TwoOpt &__move, const Route &__route)
    +

    Detailed Description

    +It updates a couple of edges. +

    + +

    +Definition at line 19 of file two_opt_next.h.

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_next.png b/trunk/paradiseo-mo/doc/html/class_two_opt_next.png new file mode 100644 index 0000000000000000000000000000000000000000..dcd858a5ef12249b034bd7c7de568b3f6506ea55 GIT binary patch literal 475 zcmV<10VMv3P)Nzh>Y<1zpjf(}tjMkLD>41rWZ$!2|c zfpvq5&kWN|fuR)y7MLC`5HXVWFv5DbqE0CbGHnB6ZvYualqqs`DD^vo32hIFt%rrGCWwZU`npuBJHwl+E^3!(HFktT)NyiW0vyPxP`M<5R9f^lbJlPuD*dwA;1 zSy(Nj&Cm_A!3LwMfR|Ach@qOj2MZ<;Q_K*U?wp+Z=9)3&qo%S{cS0NiV{d_P*aPD@ zfK5}+HA5Xzb|ZwSg_P>uhe{2+a2R8Dr?h7@F62zv3 RLgWAd002ovPDHLkV1k-V&M5!@ literal 0 HcmV?d00001 diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_rand-members.html b/trunk/paradiseo-mo/doc/html/class_two_opt_rand-members.html new file mode 100644 index 000000000..e379746af --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_rand-members.html @@ -0,0 +1,40 @@ + + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    TwoOptRand Member List

    This is the complete list of members for TwoOptRand, including all inherited members.

    + +
    operator()(TwoOpt &__move)TwoOptRand

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_rand.html b/trunk/paradiseo-mo/doc/html/class_two_opt_rand.html new file mode 100644 index 000000000..c679ebf61 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_rand.html @@ -0,0 +1,57 @@ + + +ParadisEO-MOMovingObjects: TwoOptRand Class Reference + + + + +
    + +
    +
    + +
    +

    TwoOptRand Class Reference

    Inheritance diagram for TwoOptRand: +

    + +moRandMove< TwoOpt > + +List of all members. + + + + +

    Public Member Functions

    +void operator() (TwoOpt &__move)
    +

    Detailed Description

    + +

    + +

    +Definition at line 19 of file two_opt_rand.h.

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_rand.png b/trunk/paradiseo-mo/doc/html/class_two_opt_rand.png new file mode 100644 index 0000000000000000000000000000000000000000..9d084fe7c5e1e890b77f0d329c19e76489dceba3 GIT binary patch literal 480 zcmV<60U!Q}P)KqPp$4#KBccp#i-|pS2EF~p5u9C{nD{COMbH}Rw=D9m%>?hxj zt8Cz|;5vU8ciL-j;D6wL<~!r&`E_I5y_Frffg8Ai8@PcRxHCBHYE$UB2N<~CIMFD$ zNe=bS?YvLbK{X5|)VUAh?2>vyib5GG4sZgHK{$g03lQuStUAGi4&mr#Q&PbxCHF2n zuj7;fcorwt;_~1O4wg$|u*DtjT>@#h^xTQEkd;mP98|Woo$t + +ParadisEO-MOMovingObjects: Member List + + + + +
    + +
    +
    + +
    +

    TwoOptTabuList Member List

    This is the complete list of members for TwoOptTabuList, including all inherited members.

    + + + + + + + +
    add(const TwoOpt &__move, const Route &__sol)TwoOptTabuList
    moTabuList< TwoOpt >::add(const TwoOpt &__move, const EOT &__sol)=0moTabuList< TwoOpt > [pure virtual]
    EOT typedefmoTabuList< TwoOpt >
    init()TwoOptTabuList [virtual]
    operator()(const TwoOpt &__move, const Route &__sol)TwoOptTabuList
    tabu_spanTwoOptTabuList [private]
    update()TwoOptTabuList [virtual]

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.html b/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.html new file mode 100644 index 000000000..c424d0e07 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.html @@ -0,0 +1,133 @@ + + +ParadisEO-MOMovingObjects: TwoOptTabuList Class Reference + + + + +
    + +
    +
    + +
    +

    TwoOptTabuList Class Reference

    The table of tabu movements, i.e. +More... +

    +#include <two_opt_tabu_list.h> +

    +

    Inheritance diagram for TwoOptTabuList: +

    + +moTabuList< TwoOpt > + +List of all members. + + + + + + + + + + + + + + + +

    Public Member Functions

    +bool operator() (const TwoOpt &__move, const Route &__sol)
    +void add (const TwoOpt &__move, const Route &__sol)
    void update ()
     Procedure that updates the tabu list content.
    void init ()
     Procedure which initialises the tabu list.

    Private Attributes

    +std::vector< std::vector<
    + unsigned > >     		tabu_span
    +

    Detailed Description

    +The table of tabu movements, i.e. +

    +forbidden edges +

    + +

    +Definition at line 20 of file two_opt_tabu_list.h.

    Member Function Documentation

    + +
    +
    + + + + + + + + +
    void TwoOptTabuList::update (  )  [virtual]
    +
    +
    + +

    +Procedure that updates the tabu list content. +

    +Generally, a counter associated to each saved move is decreased by one. +

    +Implements moTabuList< TwoOpt >. +

    +Definition at line 46 of file two_opt_tabu_list.cpp. +

    +References tabu_span. +

    +

    + +

    +
    + + + + + + + + +
    void TwoOptTabuList::init (  )  [virtual]
    +
    +
    + +

    +Procedure which initialises the tabu list. +

    +Can be useful if the data structure needs to be allocated before being used. +

    +Implements moTabuList< TwoOpt >. +

    +Definition at line 17 of file two_opt_tabu_list.cpp. +

    +References Graph::size(), and tabu_span. +

    +

    +

    The documentation for this class was generated from the following files: +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.png b/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.png new file mode 100644 index 0000000000000000000000000000000000000000..3f6c829107288ba3cd0eb65c7d1188edc7329ed6 GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^eLx(*!VDyBp9iD>DTx4|5ZC|z{{xx-{~wq?KVbrp z1;z&s9H>6@{|S)GSQ6wH%;50sMjDWv=jq}YQZeW4)WE(Y3LI^(Punz`FDP!l%l$U^ zeSM2-Kv!=1E1xsVtS73uKK-uU#20*hojw- zdq-!+n=e(AE$9ehNaeO(bmH@hpAUL2n!UElTBW1B#!}GJL?x+Dy8TFSi41pV&+3gu z&oX3gzP7Yk7}TS*By^giHDCCJ;xyZ5!G26{EjFHW|2mC7FxzgaT}jCNAf<_REBe27 zUvktaG7dPu^_w^6itp+tU)AkRf1)mbWMxjlIg7pjta;0_1^+6h|J*6^e4EbnM=|T- zn~g0XX!_#>`PmD+PbC(_JuG;5&^JUVz}=E5^SYJoIrR|d5BCbS{x>Yg3&P+~@uAi)IE`Mj|Im;YtzZ*|B->o>n`K=%) zTs~)Azd%60lI^L#OmhAwR9GypU#`nt`*quYbHCNR=OmY3u755ba_Hx^lgFz;@y6ik L>gTe~DWM4f-iOjl literal 0 HcmV?d00001 diff --git a/trunk/paradiseo-mo/doc/html/classes.html b/trunk/paradiseo-mo/doc/html/classes.html index 83d6f5416..c4c3f1aba 100644 --- a/trunk/paradiseo-mo/doc/html/classes.html +++ b/trunk/paradiseo-mo/doc/html/classes.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Alphabetical List +ParadisEO-MOMovingObjects: Alphabetical List @@ -8,6 +8,7 @@
    -

    PARADISEO-MO Class Index

    A | B | C | E | F | G | H | I | L | M | N | R | S | T

    +

    ParadisEO-MOMovingObjects Class Index

    A | B | C | E | F | G | H | I | L | M | N | O | P | R | S | T

      A  
    -    		moHC   
      N  
    -
    moAlgo   moHCMoveLoopExpl   moNextMove   
    moAspirCrit   
      I  
    -    		moNoAspirCrit   
      B  
    -    		moImprBestFitAspirCrit   
      R  
    -
    moBestImprSelect   moItRandNextMove   moRandImprSelect   
      C  
    +    		moILS   PartTwoOptNext   
    moAlgo   moImprBestFitAspirCrit   
      R  
    +
    moAspirCrit   moItRandNextMove   moRandImprSelect   
      B  
      L  
    -    		moRandMove   
    moCoolingSchedule   moLinearCoolingSchedule   
      S  
    -
      E  
    -    		moLSCheckPoint   moSA   
    EmptySelection   
      M  
    -    		moSimpleMoveTabuList   
    moExponentialCoolingSchedule   moMove   moSimpleSolutionTabuList   
      F  
    -    		moMoveExpl   moSolContinue   
    moFirstImprSelect   moMoveIncrEval   
      T  
    -
      G  
    -    		moMoveInit   moTabuList   
    moGenSolContinue   moMoveLoopExpl   moTS   
      H  
    -    		moMoveSelect   moTSMoveLoopExpl   

    A | B | C | E | F | G | H | I | L | M | N | R | S | T

    -

    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +moRandMove   moBestImprSelect   moLinearCoolingSchedule   RouteEval   
      C  
    +moLSCheckPoint   RouteInit   CitySwap   
      M  
    +
      S  
    +moComparator   moMove   moSA   moCoolingSchedule   moMoveExpl   moSimpleMoveTabuList   
      E  
    +moMoveIncrEval   moSimpleSolutionTabuList   EdgeXover   moMoveInit   moSolContinue   EmptySelection   moMoveLoopExpl   moSteadyFitSolContinue   moExponentialCoolingSchedule   moMoveSelect   
      T  
    +
      F  
    +
      N  
    +moTabuList   moFirstImprSelect   moNextMove   moTS   moFitComparator   moNoAspirCrit   moTSMoveLoopExpl   moFitSolContinue   moNoFitImprSolContinue   TwoOpt   
      G  
    +
      O  
    +TwoOptIncrEval   moGenSolContinue   OrderXover   TwoOptInit   
      H  
    +
      P  
    +TwoOptNext   moHC   PartialMappedXover   TwoOptRand   moHCMoveLoopExpl   PartRouteEval   TwoOptTabuList   
      I  
    +PartTwoOptInit   

    A | B | C | E | F | G | H | I | L | M | N | O | P | R | S | T

    +

    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_algo.html b/trunk/paradiseo-mo/doc/html/classmo_algo.html index 4df7acbd0..f79de7217 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_algo.html +++ b/trunk/paradiseo-mo/doc/html/classmo_algo.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moAlgo< EOT > Class Template Reference +ParadisEO-MOMovingObjects: moAlgo< EOT > Class Template Reference @@ -8,6 +8,7 @@
    -

    moAlgo< EOT > Class Template Reference

    Description of an algorithm of the paradiseo-mo library. +

    moAlgo< EOT > Class Template Reference

    Description of an algorithm of the paradiseo-mo library. More...

    #include <moAlgo.h>

    -

    Inheritance diagram for moAlgo< EOT >: -

    - -eoMonOp< EOT > -eoOp< EOType > -eoUF< EOT &, bool > -eoFunctorBase - -List of all members. +

    Detailed Description

    @@ -58,7 +51,7 @@ Description of an algorithm of the paradiseo-mo library.

    Definition at line 21 of file moAlgo.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html index 4c0ce5bab..826ddc98d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

    moAspirCrit< M > Member List

    This is the complete list of members for moAspirCrit< M >, including all inherited members.

    - - - - -
    functor_category()eoBF< const M &, const M::EOType::Fitness &, bool > [static]
    init()=0moAspirCrit< M > [pure virtual]
    operator()(const M &, const M::EOType::Fitness &)=0eoBF< const M &, const M::EOType::Fitness &, bool > [pure virtual]
    ~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]

    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html index 50995f59d..e42a8ba8a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moAspirCrit< M > Class Template Reference +ParadisEO-MOMovingObjects: moAspirCrit< M > Class Template Reference @@ -8,6 +8,7 @@
    -

    moAspirCrit< M > Class Template Reference

    Description of the conditions in which a tabu move could be accepted. +

    moAspirCrit< M > Class Template Reference

    Description of the conditions in which a tabu move could be accepted. More...

    #include <moAspirCrit.h> @@ -38,10 +39,8 @@

    Inheritance diagram for moAspirCrit< M >:

    -eoBF< const M &, const M::EOType::Fitness &, bool > -eoFunctorBase -moImprBestFitAspirCrit< M > -moNoAspirCrit< M > +moImprBestFitAspirCrit< M > +moNoAspirCrit< M > List of all members. @@ -88,7 +87,7 @@ Implemented in moAspirCrit.h -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.png b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.png index b57b8778692c145f9b6876cca861b2d4e4130e15..b959606a7b2df5e8ea6c548dbd4123dfa983d5f5 100644 GIT binary patch delta 741 zcmVawC6!usrNs^VjB`l(-wDze60MYDzrGSABaP% zTrMiX7&#q-pYMH=;<~JfV)%m-NUo@gLXHAQw}cBX$sSEpdBqH?X(09 zmnos8LuQbgvIidv8YaRnhnvy|f0q!YM7TT{);YNp&}sXPT3cx%ouP%C4-TiHyy&@p z)~NS`raKSrp>t8BPCk2udN*jtqwe8K7wAK+w98#5(7b!Ns;2Wqj#JaLd+GvX=)e2JbUfR!?gqV;`&j5xK0;9FV{d?We{@RdYuuaQ z4V@AC<9gj2L9bInpYujE=&fYXTgjlel0k2!gFvTW=5dOnpa=P~;vipxZWRal8g#2T z$k(7-#X-IX-6{_9HRx7xkgq|vii3O&x>eK!|L)fxMeI-V{-HSGuOjyHD-4l9kMaIA z=t>6N=={)F4In`2`qcLre|(@<6^Y=v>zD5qhiA|@2PzD^pchAvIRV~U_)rGqjMUB( zeGXmD)EKtVNRvaLIVM0PPh{vcb4=^ZQ>JlbCr^j3HFS64q|`lv`y- z=`qw;V=jzow@mqJLhcRHVAdcEq1(((wfE=QXaCqg&N;vHKIgpWch38J-;;R|>!GW& zK?eqd>3Z&W#lc|93)NVtu|nN@=c8Y#hxG@&{oGV4l^Uv4!t(ONd1~~&35CMMpHw62 z=`tz~>kHdA)_V*F)2#4xb@GcZnJV>(duF@FOvd4U;cpwv;4B{kiAEh5q5_zlHRzgQZnw2q$?_}*+bYRCwgs@B!3op#)Q=keZA4)B;+QL@@H-$l?g=3?pYJTTB> z9z6ZIMQFX9;5@{3aGGXW$ypjlSL)-r+3ct@+c7_E#DF-e*ut_qzfB`hLg#!k(ZdN@hn3bPjVKRS2;k*Yg z=jwh_3Mni}3ectss%?QHi!3Hqc^d6_;?yvUDky6#61mA|I26Qd`_{y4Ft!zbCFKCl zoMta><7OWjoYC%i#qk68)aNgP%so(9z0hsU`lBXg*2J)E)`JsjQq5d>Bza+QVStbv zCu!i!=Dw|a8>x5>Om9iP5~lyRpteNQ=e5`yZG+pROO|N5Pt^*jsY*=+jzoQ7w27*n z7PIk3l9!cZZwc7o1m7sIuNOIzT82L%D9YN$lL)EW;dLdImX_sT7}Dss&^7RD z_gB&q8kGm0Dx@9UH&Iu75xdBZKT@gz+C7Kwpgi;9amo~`bD%L`Ge|cEFBnbEhYsWOntr0u^Q5XL9;$k^UCA87>INvY)%-YIX zycYGj>BuIN3e^9GinNj$)m;T~$rOGeCSO$>n^t1_)ejhh_s2Kh!i=+BuJ;@rgnM3% z+_vz5$wTnj%C);mk_ieHN$^G2E!|?bbY5#NE(I8lH0}J_R%d_jDNWPjoLX8?Obg>i zza_cBz&NGQ9-q}6kZgjyVWZuD^~ljSjoSuUgOQm>;h(ZI2K>X9HFq+QIU6cR{J{2~ zWD~${;+;=sVgVPwVmm^9ULqBXm^|mtUnr=yc)fMn05VPpoPNX3fCT1qaPU$mF^NC# zJMYjgGFlx@r`k-&XoB8tvISmt6^9y=&@qc^{VeQB7wOXD34$Y^ybh$@lMJ)Wru0It zuCwa8Tv*9Fb#M#|;x?sQ^^k6&Q$|@Mb8DUZEcJ&wL`Z1EXg}#XAGA}LT!ewRlP3&u zdtN`}RRhEja3@>oo59!^8$=Lr02di$=OM4Yx+OLp&zof}B|VJq!zT=WdFfQ+JY7O~ z6(96QaO@ovP>mPS(xiS_G(V4SytoJ^T>HMZOYVrEaXaY_jOQ$|RH?+-$Q=$vyx3{1 z -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@
    - - + - - -
    best_movemoBestImprSelect< M > [private]
    first_timemoBestImprSelect< M > [private]
    Fitness typedefmoBestImprSelect< M >
    functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
    init(const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
    operator()(M &__move, Fitness &__fit)moBestImprSelect< M > [inline, virtual]
    operator()(M &__move, Fitness &__fit)moBestImprSelect< M > [inline]
    update(const M &__move, const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
    ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html index 5a03d73aa..ee67f6a98 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moBestImprSelect< M > Class Template Reference +ParadisEO-MOMovingObjects: moBestImprSelect< M > Class Template Reference @@ -8,6 +8,7 @@
    @@ -174,8 +173,6 @@ Procedure which saved the best move and fitness. -

    -Implements eoBF< M &, M::EOType::Fitness &, void >.

    Definition at line 68 of file moBestImprSelect.h.

    @@ -184,7 +181,7 @@ References moBest

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.png b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.png index e803a39a43bee14670efe218d4fc1ad1dcdaf15e..5b868e9d7a0908bd78d7ba048e0e55fe63d120ba 100644 GIT binary patch delta 474 zcmV<00VV#j2!RA4iBL{Q4GJ0x0000DNk~Le0001z0000`1Oos7004C{0+Asze*u?C zL_t(|ob8oeZo@DLfXz#v4L5LhgY80l%KeWpeoRUdH%mKfN+pvN+ZeuLu$1)GOVa1m zM?MDWHBza+MG$qMu6V+Vc{Wf0p$Uz9!u_ zRwTD?Nz8{e2}A>01oAWkvWaQHo&XxjcH2bJk4RYpH4ljv#V-Q0WSup{?Cz(8oaI%b zlQfnUqD7<%(@;>~KuS#_E)U zeO)Jgc6E~8$-U9uC9EXrFrD3}&^vFKllJ#%FL1QEb$vV16Ea9=N!`9uKa3Fs9H)xM Q>;M1&07*qoM6N<$f&fs`wEzGB delta 1039 zcmZo<*~FpP8Q|y6%O%Cdz`(%k>ERN@z`zJ(G8|xG29lD87lck!G_Gep;pyTSQZeW4 z?7(TW4R~B1F2C<#EpXRy_rkif|E341cpod9ACVxKPhsTe1 zGuPDo`T30DZnpqP8X25pF4^yR@vj&!1H%TU6<3rZ{|VRspS{#{M&68HX198z%vgk1 zer0|;L08m4b^D9JXZAU(5B}c9wP=4m%Z-FA2A?+;EClFw%^vMKX#sAtKrGHV4@9ku_;Rk zbH#h#hBw7|43`9ppDtvLFy0W!tas3hCsE>6AqK_o3#cDcNE+`SZOOX4l1k-XQ$ovxM~Y#m;i|=jy~lre6)e zHT{)tUc#NSvN#Ut)C_k)eORqRTO zQ*w&+iScYTtkK*H6n9KGxg${KyMPR{K>b2R4bSXtY!}Tu_s-(3&F4S(nxXi`w2hI* z0u0yF6`tFfMBiM~7$Bp+wo#+5I&tBRb<9U~Ixd~>dOYu2T(}d+h2I%U{zu*W+kSF4 zbIJ6#yP$+VSPt1Y^%ndNb8j2OPG}X*Wnp0W#w6f+{MQ7-o5w5cU6&s!<2*3s@74Al ze;E^g`cG%@x%{Zw(wo<0Qq|IO@lw7h8XLbXLF zXcPav^Gy03k6$RL8ylz{Pl>!x($kp8&%2R{hb@%BM)d}-fhEgUhLfr9W*=lz`#Co# z)<)5S#b9k4&x5l2Ya}@uyp0V+F9!4awC-KUSRE6}Y{hNzH&ZMk^ws1XA+_o=O&Wh0 uDsK73aIW9k!t|ilu7}}+JoA@-QUAonZB^f|>0(z0`O?$X&t;ucLK6VnysXOr diff --git a/trunk/paradiseo-mo/doc/html/classmo_comparator.html b/trunk/paradiseo-mo/doc/html/classmo_comparator.html new file mode 100644 index 000000000..744b71915 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/classmo_comparator.html @@ -0,0 +1,63 @@ + + +ParadisEO-MOMovingObjects: moComparator< EOT > Class Template Reference + + + + +
+ +
+
+ +
+

moComparator< EOT > Class Template Reference

Template for classes which need to compare two EOT and indicate if the first is "better" than the second. +More... +

+#include <moComparator.h> +

+

Inheritance diagram for moComparator< EOT >: +

+ +moFitComparator< EOT > + + + +
+

Detailed Description

+

template<class EOT>
+ class moComparator< EOT >

+ +Template for classes which need to compare two EOT and indicate if the first is "better" than the second. +

+The objects that extend this template describe how an EOT is "better" than an other. +

+ +

+Definition at line 21 of file moComparator.h.

The documentation for this class was generated from the following file: +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/classmo_comparator.png b/trunk/paradiseo-mo/doc/html/classmo_comparator.png new file mode 100644 index 0000000000000000000000000000000000000000..f2d2bf10d893c64c6fcefe3e8a1a3c825ecf7bf6 GIT binary patch literal 519 zcmV+i0{H!jP)JNRCt{2m0fPb zAPmRx%bsm+Ku%C?7n(Gw_dmk?MG^vRY~`Vqa4Q1NpP!A5lt5Dr1BRKlc(Zv#Z6#b( zq*9<#U-2MxGA?5mZ1j=4k+| zc~tR4f9Bir|zZ~X;5FVD5VzAxXuZhu<_{Z~DEY2H6<@gC*P{$38+=hS0N=e^yZn|Hr|J~i*z z`@49Hw|I-Uc#F4qGkG6l_BAHEh4*cyE#5?4B8q8?{ETgN;TE+@i4J|q^G(rbzwpeH zwzFD!$&ylkN|Y?Rxg%|x literal 0 HcmV?d00001 diff --git a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html index 52c4b3e6c..759a763d5 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moCoolingSchedule Class Reference +ParadisEO-MOMovingObjects: moCoolingSchedule Class Reference @@ -8,6 +8,7 @@
-

moCoolingSchedule Class Reference

This class gives the description of a cooling schedule. +

moCoolingSchedule Class Reference

This class gives the description of a cooling schedule. More...

#include <moCoolingSchedule.h> @@ -38,12 +39,10 @@

Inheritance diagram for moCoolingSchedule:

-eoUF< double &, bool > -eoFunctorBase -moExponentialCoolingSchedule -moLinearCoolingSchedule +moExponentialCoolingSchedule +moLinearCoolingSchedule -List of all members. +

Detailed Description

@@ -55,7 +54,7 @@ It is only a description... An object that herits from this class is needed to b

Definition at line 22 of file moCoolingSchedule.h.

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.png b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.png index f60c26373fa68cbc49fdab1b9f4dacd895aa4613..078143b2df0e36e3111cade89ddcacd7d4a26fde 100644 GIT binary patch delta 761 zcmVq{SPks&jG0?A24K~#90?U+%Hq#zK6A)CxI#SL&T zu-QrWJSLm;{g1Fv1&WGFY15+1|1fA#^}{EMJqp2k|lB3L(qQZ@>T=4D$6ZWW}oN7zN3Kz%Oa)(BD*mm$D^ zFfZ5dTICSvj{pjSpd9I&q|ya3+hen`AQ)cp}8^M9BM z5$baP$RG`&hCv!a<{uLmH!`m1MfTK7lzdcCfm!dX24;R%m(L#ROw zp$0XC8q^SKP<;rm52!FgU)W!iU$?%nzi0><>I?gehLEAYu)k;s8R`rBi-wS)zOcV& z2pQ@N`-_HIeHp@f&tLU zEN!s6>i~w_Zb&YX}%f5P@jvqR9w+H0;aoUyw(uhY@F{sLD1mhSm4SvokflB)_yJM zgnFzW1)(E<;~Tspa|9S>5mmTlzpaDBGG2Q}>! z7+K$ud=JolNfnsR_l^-}T75kvm3|opoqIcPdwZQl&;=3pyuHpM7})MVgRtlA^|YUP r1=J97)DU*{5d`KJ52lWMgyHHRpi-kx_My^)00000NkvXXu0mjfuwi8y delta 1243 zcmdnYHj!(BIM)FdW(Ed^Z@Qd%6BUi?S(bacIEGZrc{?{ZZ;1gnR?iKjtEW7sCP91BO-|wUySd!~aEV@lCHaoIxZ%^H!l(3s!R^Y%}ssBlH zOzUM{_5Mp}VwiBLf@K!>xl>XHw;8=`m1N>mDPY!||89>!TcR{${Mlz)_Q@#D^ge9shl2IMv48ZTOtU@X#>sZqwym z_J^K7E-V#3w~DbvY}saof(b~d9+?AY3%Iwi{d2i=NPZQIqX0{yDC6U$lPb1KJYPAv zc1F(Uq!@uukJVcwE*#@kWNTW=k+4TFIh5D6(U)Vw(f-(8gVx7_P5n=L8Y?FpdDPk{ z@+e%hOTYi}ZZXE@_eRROHcg!Gcb*eS;}KUlav`KXho8rrqi){q*u5fdDlTxVT>LgynRmX5bY&+l$4=lJK^Xx{WG)#{c`)vk5oD?E)^_NQ}xTx1uO*RkMN zLqd9)OGN!2ql3Z=y#=OtRXtqseR?+c!R=%t$;35p;;+`f-@b8Ey($O0N!YjbEDsxwo%%ObLFPil&HX|x z%u?FF!$ov!f4 zQ=o5!Da+<>Ecsr>9WOsR-PEj?k$k+-ukV_`m*Q{RlJ0kNbieJte&O?}=c#A!d~|G? zS%0c_ImfZYU?a!f$$y$REbry~8CdHVsI_`y!?HUQt<+SnOoi9cu#wCfU z>YeX-9GyQ+D9Ww5b-ZNqlg)D`MgKCMA!W48Pu1A=;U7uHB<)Gs276P0>J+yKez^GL zv&$ScJIlH--cb9Nf3ssZwHU;jiyrl^e^4#Rc)xzR$U&pl>;&0Hf!eSe5xnP)#Ij7c z7d8_xt68r&W6tzDdi+al1Xuc*sXbA<`@Z!8`_p~b1x(J}e?E_U?z;4=5_2U_GO043 zWS;W7&Z$7VQP%uqm&p;EvpbX|f5prQ<1IfI=iv4>oNLRP^&TZ`4M9g2nY(Cxo2ztY z%X~wVt7UCh+=}O)+kG>9?m49wT^!Z>Jkteva^~ANZ+JfY%B|~rxP)4ig<4|wvM&74 i=f1G6NO)Pue}*sJJm -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

moExponentialCoolingSchedule Member List

This is the complete list of members for moExponentialCoolingSchedule, including all inherited members.

- - + - - -
functor_category()eoUF< double &, bool > [static]
moExponentialCoolingSchedule(double __threshold, double __ratio)moExponentialCoolingSchedule [inline]
operator()(double &__temp)moExponentialCoolingSchedule [inline, virtual]
operator()(double &__temp)moExponentialCoolingSchedule [inline]
ratiomoExponentialCoolingSchedule [private]
thresholdmoExponentialCoolingSchedule [private]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< double &, bool > [virtual]

Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html index d267bc82f..e528813b4 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moExponentialCoolingSchedule Class Reference +ParadisEO-MOMovingObjects: moExponentialCoolingSchedule Class Reference @@ -8,6 +8,7 @@
@@ -136,8 +135,6 @@ It decreases the temperature and indicates if it is greater than the threshold.<
Returns:
if the new temperature (current temperature * ratio) is greater than the threshold.
-

-Implements eoUF< double &, bool >.

Definition at line 41 of file moExponentialCoolingSchedule.h.

@@ -146,7 +143,7 @@ References moExponentialCoolingSchedule.h -

Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.png b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.png index 02c711475435533e49c9c1d63701878b8f0800f9..f00c024dc2f9da30ff3b4ba32a5e1b15f4f115bf 100644 GIT binary patch delta 505 zcmVLyI%4$4dbJw7A&ok{o{YVYA=8EKRM%KU^>rj#~LUpK2meDXTl zIv?Pt#1OPfT$a4!yno_Zk|%L6k;d4Qqdfm9pGuKzmy7ue^(%A5NtS~;P}Sl+{z5%} zzRman#7V2?$$TLSAJO@UPvVpF>o$7yJA6Ymd~BTMT7GdptOu5QrJwx4RGiE={Ukc3 zpIf#k^c_3MPlNeOS0qp5AGOKBKlzhC z`IA5S=jY>4iy;nZ(rxlzh!1?<-7JuQFpF)?^+I#5>sYN?{{AjB3{LS}Xo(#@@MZv| zCQkr#wGM!wVJSk(jgknw!Q`KIKWFP+x>{J@fo`+R%8Y|!~~?N@wgcVWE#`IMPt^Q$(X zy5EW)TwuYC&JEUmS00000NkvXXu0mjfaEk<- delta 871 zcmV-t1DO1^1fU0y7Ye`x0{{R3qeXulks&jG12#!SK~#90?V3xH;~)%%&1Tj}H;_*- zHFKd}<^D$)kc0uh+Sp-YcZo#|0zQLKQuZGWf4i37!=JHdG5+oO08q4Ovf`WgHHRiE zEr+)8DXcrJ5}AfX7%hO&j2QVmfXAHTM`)lVK9X4C9f8*`P1@VZ0Y2~^(yfG#>i=MW z9Z&NEqFjH?7yrbaP<8%I>mT>|d^Wgy&PV-ETE!XvivNrFA!JOjki-xBpMb8!&pV3o zjel=`@8^@o^3^)wUi@FLXY*gLuSfHr9zVu6zVVH3eB&G6_|NC}e!qD7`E57KWN$J|>Pm-JRX(qlEdfVim zq>IWFILc>%4J)Hul#i4DEB@>TGyWubiWZ6E8lMk7RB4r8-(a!+vGmWz`UR`FruFao zpGyBz+Fg_XH4vx@292Mnffn%t=|(N_(^$U$3*Z|6`@b-L=I@*F{~y2i^GWZ2=c{}1 zP5=BX|LO5#eB&G6_{KNB@s0m{e((2-r@wz0|2&^^YFkdzQ)6ydttNhv0pg -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.png b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.png index a2a1234c8817927ee34de29656b933c61a3cce65..c7295b0509209bfb7410b3493cbff09ddd350dfd 100644 GIT binary patch delta 473 zcmV;~0Ve*d2!I43iBL{Q4GJ0x0000DNk~Le0001!0000`1Oos70PnY2Jdq(Ye*u6hShT|8W_4@|S2|DeC`o#T@P_2m)426>E(2fOoll*B5lj-9qd7Iwn zgJhtdKsEm@0_aqeKK3=+bx^Fw7F~NNm}w8y8e2CwN*3~gT}5RjRFC>SszP9ukQ9=_P75YH^5LLJh#g`iw1!RZIf2}F@%h?W< zml;K-xS0@CDf$&gfi9^Wl@RC9g6qb67LHk3hHh0usf*W1d1#vAJ(V>bv>%G zqL5IRwQ|S%TCE+_1j%X8FGm5CI~Z*XROh+s$OHd{zlnN42I>*iaWAhgRXquAnRmbl P00000NkvXXu0mjfG!WNL delta 1032 zcmZo*SERN@z`zJ(G8|xG29lD87lck!G_Gep=;`7ZQZeW4 z?7*_e3Oufl=l^uO)o5cq<7UAAUH?^iI5?RL{odTrJNu zm|u54BSV8YL&plM$w^PwGiAtnZah_cbuy#My~;iQVdXl9PCCswbB5DFJ7aD(!=&pk zjxk1TQdOMjrZE51yofza4pOY?^(Pr}ECtqnE@imrF54)k!0*`AYT{X?#_)W1HP3>d z2X{~U_*6!q`n2qUrIrC_nG(MW>rP5>wa zUd~)oSNEr&;h`r7NE#U&XKefLVE9K}ih&`4(Ico^tGU{d6rwe;`qT*HXFagJL)S2u_*<8wIL7t4^tv+B0UM3?mfvmI}|+xsO! z%KK8ZRKucw6<43QtNcBCRbWNqQ@#ctuOicxW+lxLDXM1rx(qX)xE1pr;60F|9P7T| zMaU`*FV(!K%WBvs=+_4@UXb%B?EJ3 z2i=CNajY7(=VTr749#u7FnF_s6(3NE_^4RoY|TBR_JnnVD*KXoCs$iO*xayUmh(~h zLdBDNe^~`QN+?R2XcFqRF0JwV0>#MLtmjWBYnF7r&$i8Bsd$r|YI&>v>fwv$o6;g{ zm)5N2S7!JV((thV>EZn|_E;Y%xS3}GAwHT*jFyqkmb6oU$@k6+wODQVkW*fz9Jibonb=m8?PvyaHqK+Y|5=- z*IJya7gJ1(X31fX=ARH#pgOs5xkaAh4R(cZYC9L`tbHlxVw>_cYu%T9WI6LR}FghXC~q3^MEs4n7t0>p0YC1oV(JquL^awWc#QQWj5rFjeceCPV+M zmYSD*3i~ceG6b(On0PnPX0deZf@=b@EfZ$F{#wy7UCl~bVS<%$!;e+ + +ParadisEO-MOMovingObjects: Member List + + + + +
+ +
+
+ +
+

moFitComparator< EOT > Member List

This is the complete list of members for moFitComparator< EOT >, including all inherited members.

+ +
operator()(const EOT &_solution1, const EOT &_solution2)moFitComparator< EOT > [inline]

Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_comparator.html b/trunk/paradiseo-mo/doc/html/classmo_fit_comparator.html new file mode 100644 index 000000000..8d9659698 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/classmo_fit_comparator.html @@ -0,0 +1,67 @@ + + +ParadisEO-MOMovingObjects: moFitComparator< EOT > Class Template Reference + + + + +
+ +
+
+ +
+

moFitComparator< EOT > Class Template Reference

Comparison according to the fitness. +More... +

+#include <moFitComparator.h> +

+

Inheritance diagram for moFitComparator< EOT >: +

+ +moComparator< EOT > + +List of all members. + + + + +

Public Member Functions

+bool operator() (const EOT &_solution1, const EOT &_solution2)
+

Detailed Description

+

template<class EOT>
+ class moFitComparator< EOT >

+ +Comparison according to the fitness. +

+An EOT is better than an other if its fitness is better. +

+ +

+Definition at line 20 of file moFitComparator.h.

The documentation for this class was generated from the following file: +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_comparator.png b/trunk/paradiseo-mo/doc/html/classmo_fit_comparator.png new file mode 100644 index 0000000000000000000000000000000000000000..7e75531a62031e84abc38f47029befc1bfa5eb7c GIT binary patch literal 510 zcmV~jmgVc+Fpmm}0Xa0hR5#zQQ4(Jg`; zO1pTR_K}|gOWq~F#M3a+Mjp2JE5H$+L7>X-!t3Uzip0YfFQ4D3zSr|h^<^z!EVm%F zz7mRCt8cn5>Hbyq{mq_yecqn;q%Gd7yvg6o9~T=VJDQcy0{{R307*qoM6N<$f(!ik Ao&W#< literal 0 HcmV?d00001 diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html index 105cab6a4..3b6517dac 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
+ +
+ +

moFitSolContinue< EOT > Member List

This is the complete list of members for moFitSolContinue< EOT >, including all inherited members.

-
Fitness typedefmoFitSolContinue< EOT >
fitnessmoFitSolContinue< EOT > [private]
init()moFitSolContinue< EOT > [inline, virtual]
moFitSolContinue(Fitness __fitness)moFitSolContinue< EOT > [inline]
operator()(const EOT &__sol)moFitSolContinue< EOT > [inline]

Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.4.7
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html index 66eea757c..789f4e8ca 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moFitSolContinue< EOT > Class Template Reference + +ParadisEO-MOMovingObjects: moFitSolContinue< EOT > Class Template Reference - +
+ +
+ +

moFitSolContinue< EOT > Class Template Reference

One possible stop criterion for a solution-based heuristic. More...

@@ -131,7 +134,7 @@ Indicates if the fitness threshold has not yet been reached.

__sol the current solution. -

Returns:
true or false according to the value of the fitness.
+
Returns:
true or false according to the value of the fitness.

Definition at line 43 of file moFitSolContinue.h. @@ -168,8 +171,8 @@ Definition at line moFitSolContinue.h -

Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.4.7
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.png index 84c76d5a43b8e43c2c138a6c9fec2e33870a437f..7cb89b9dba51e67dd0777f9109cca7190f0b35bf 100644 GIT binary patch delta 30 kcmZo+XFVdQ&MBb@0FvPeKmY&$ delta 30 kcmZo+X -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

moGenSolContinue< EOT > Member List

This is the complete list of members for moGenSolContinue< EOT >, including all inherited members.

- - - - -
functor_category()eoUF< const EOT &, bool > [static]
init()moGenSolContinue< EOT > [inline, virtual]
maxNumGenmoGenSolContinue< EOT > [private]
moGenSolContinue(unsigned int __maxNumGen)moGenSolContinue< EOT > [inline]
numGenmoGenSolContinue< EOT > [private]
operator()(const EOT &__sol)moGenSolContinue< EOT > [inline, virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  + operator()(const EOT &__sol)moGenSolContinue< EOT > [inline] +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html index 970b2bd77..87beec67f 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moGenSolContinue< EOT > Class Template Reference +ParadisEO-MOMovingObjects: moGenSolContinue< EOT > Class Template Reference @@ -8,6 +8,7 @@
@@ -136,8 +135,6 @@ Increments the counter and returns TRUE if the current number of iteration is lo
Returns:
TRUE or FALSE according to the current generation number.
-

-Implements eoUF< const EOT &, bool >.

Definition at line 44 of file moGenSolContinue.h.

@@ -175,7 +172,7 @@ References moGenS

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.png index b40e349915ec015116a4058123385084528f5689..84c8334c7d9fedd73d390d7786a5397e223104bc 100644 GIT binary patch delta 483 zcmV<90UZ8>2Z{tCiBL{Q4GJ0x0000DNk~Le0001}0000`1Oos70Dq(-^N}Gle*vIL zL_t(|ob8oMZp0uAhViCr|GokA2JMBqn)@H27z1HK2DMVsDv})q955e#NeQ19Ncc#n z%ezDW0vaJ@N(ty|Nv5OF?fgb;b}yl#JmtjHQSrbZv2{t)g#%PXof9)gb50kKM~P9l zBtZtKr19zlD57HXQ|^{nU5N?heQIL|)STXqRTU8F^&e;?P54dufI;bY?OurmPX0 zT3w-l@jQ;bKRp!U%JiUa|i{DIfsuUC^yCu8fx?t zbn;XS(1PPF&H-f_?Q%L)Ie(W^Qolh~aw>gl4N)4=63jK3L-kvqPSrnK9O}^1p;!E( ZzX9jhG(SfEGCcqQ002ovPDHLkV1jQe+Fbwu delta 864 zcmV-m1E2hg1cV16iBL{Q4GJ0x0000DNk~Le000230002M1Oos70EFxQ^pPPme*+px zL_t(|ob8%jj;k;Xg~`i(j=ckC1*3a6G*8|C5^iEUe~`3gI%$PuOH9EeALd{Q<|y00 zCGoZW4J*R9ALRl-b3`SJFLL|&RI+p&`W%;Hov|up3KC(;0H!oz;_?6+G7z%}Pf2p3h~f0zxYxp8V+Z_gDSQsvY=*Qe?Y_qnV+PM_a1`jYPA zj{6gRn|>hV=`lmn53DZ%{iGjW4dWX3J=|6A`4jPdX7J~^e{R>}-frKQ;$E#EjB8xu z8rQhSHLh_bR()4r?f(no?zxmajEOgvl5C~{n=kCXKy$7TX57j3Q8(frf0W_)h|B)R zo~y}Zov}}n*>vDSLuk3hzR6q&H7Pa@9=Sya2-N^ew#|?Wpc5#x?ormat+(2WEmy$8 z&7(r*G2_m<68dt51`A^Ux2X1BBYY zSzidM&#WI_h?&9sBKNdEfB9+{_p01g@A*~VC7f$8i#Y!3j2aIGLPg>7&Fx^Jn#=xmYz`$rAz4*v3=zKW})%Ad4*RY3{ zmKUMAC)wYkkX@h$T!g&BEU2v$>hd#ce4Ok6bzH(3H?OP;u;Z3ff0-+e6)z^M^|s(K zx1dJcNUIK8r$YlCap^vnt-lfXQN4v*7n;>m(Cgdu!+m|#N0Y^8R6Vr(NZWqM{rjLF zelv_~-1l%-z2{ebmwcXU{@GgY)%wA>#x<^SjcZ)v8dn0Agx~yPRGqb9e3dRf5ho_UHZvm+;$8vdB1fe;ks0a10}^@r+LUFriO(0*UKrtl^gT2 zxgpm>n(v*aT-RjJeC*RE7h0RBw77`7V9E;f5xAZl`b44@Z5YHneeb(gcqCS6YM{RK)fw qY|{_9e@FfB`(a$;zK6T$J^vq0?UF9hobA5=0000 -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

moHC< M > Member List

This is the complete list of members for moHC< M >, including all inherited members.

- - - - - - - - - - - -
className() consteoMonOp< M::EOType > [virtual]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoHC< M > [private]
Fitness typedefmoHC< M > [private]
full_evalmoHC< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< EOType >
moHC(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline]
moHC(moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline]
move_explmoHC< M > [private]
operator()(EOT &__sol)moHC< M > [inline, virtual]
OpType enum nameeoOp< EOType >
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< M::EOType &, bool > [virtual]

Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  + operator()(EOT &__sol)moHC< M > [inline] +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c.html b/trunk/paradiseo-mo/doc/html/classmo_h_c.html index a1bc3b7c6..c0f875aef 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moHC< M > Class Template Reference +ParadisEO-MOMovingObjects: moHC< M > Class Template Reference @@ -8,6 +8,7 @@
- eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -164,7 +161,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -204,7 +201,7 @@ template<class M> EOT &  __sol  )  - [inline, virtual] + [inline] @@ -221,8 +218,6 @@ The HC has to improve a current solution. As the
Returns:
TRUE.
-

-Implements eoUF< M::EOType &, bool >.

Definition at line 82 of file moHC.h.

@@ -231,7 +226,7 @@ References moHC< M >::fu

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c.png b/trunk/paradiseo-mo/doc/html/classmo_h_c.png index 6a4aadb1edb175af9af669e32b1b3817d6762449..1d7aa771638bf7786e97d39ae6ef8c9ff85e8591 100644 GIT binary patch delta 414 zcmV;P0b%~*3&sN>iBL{Q4GJ0x0000DNk~Le0001u0000`1Oos70M^j!XOST@e*s)c zL_t(|obA<7a)clZ24H#Vvwv<7PS9yDv`^mu2n{4C3R{(7I?j~rx+{nuF)-uw-6cM! zFW)1EbIYOl&4TUl0K$*wcyi(}7mhSxGkC5{lsj@e$wbKk$42RpQF7f=NRJKdtIsZ<V^moq3@+@arUXOB~wqC;-&Txh^oZ&prL6?}Pbh%5)!)bS1 z`~q7u9&L`B(g-L2csI7@I47MB>TH+qJ2S%lbLK#K=ghn21R^-HPxUgU%&9`ZIw>Ed z?%AzR*y30|$!W?**DKaXTQ}>I)+^sXu5JI^iQ)WLr_+1q2mfyZY^e$5hX4Qo07*qo IM6N<$g1&0RGXMYp literal 1507 zcmcJPdo+t8I6OoY%#;I48~B+Y0{E`v?XPJ7Otz5TuCyx;fvKHq z>-@A=r0SAm`E!wMVE69Q54rn--d>+l_c@Ul%Fg>Rg@v+`g?sEqyl^E+H%fX^hj+3g z`WDMDQe#+FvR`rXm8N7MQ?;|t9nc|1`vE3Bx+!LYIk-z+s3?SUTbKgRa_2_k`F?!_ z06OM2YDH%6C?Ox{Kb;(FzI3K$6~?c1;hITkh{M54n_OtCU5CTeC)*gSC7nqGcysS!oxl(0T%rYSPpHLz6FzW%-X4&2d0&C2e9W8p;;olw--SxIOr`WT;P3Pboe_55ruEN;poMZL#s(WAMW^W88RGxkzEr#xE*(8|OA<=BSX7Bitl`J0N6q2CLv^YA+IHRhCmk1#O@grnXqJgXT zJeOywzdHMd}l(Piu7BM9QG9j2i?;$6w6A#dHsX zBh`IjeC9UBEt8S9e1mk9=z1WMguxwjs3t5uC8kLu3RpCO~-I zShxm^{%sk`Gr*czeG5H|WKRu4?v20gOyCgR8tgp}1D>0<ckBAk&T3ch4uQ(&; z)t$=_L-+jLB*23Lc$FWaL7Hd)Z*dySZvo8TQj>o`^Ud`&&$GX^ezcHMLi@L4$?zspl z!1*A~v-(6{(<)-+z&CM`&uI7~;KBfWtLSO~{wP?`YRxo|#Cy8V(({~6=4|`T`;e}J znx-`eEBRdH<5ck6y^58ucm0=BybnnF8-5LuJ=ZqxCbl+HGEe1ya7Z1<`)zHE^U4K- zqing_#>(PIyfSw#p>Zs%lzRPIXsxu>n_Mce3rG{us1OH3`IafVF?wF|kz(bj+N5}R z?tt}jTwiBOS9MMPdVT40K1^Xj;pxdcc;m~m2O@H5hhCxUJy%6VM5WvP<3b6CyNnC& zbW0t+5~qEZSHAqdql_9j>8jC$rs_#-WQQgOol=MkF(`=*otTIfim#U6N*ij#u>ZyJ z=QsWpKW2vSD(pz$6isW&Lp<9{&vs*UePQ&sYh^WBF!PKD -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.png b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.png index 8c76fd46e7d798861365f4696569afed1df2dafc..8c51e26c5b7ad21137cc074c8cec2c637dd5a5d6 100644 GIT binary patch delta 620 zcmV-y0+aor43Y&QiBL{Q4GJ0x0000DNk~Le0001`0001p1Oos70CYDt0g)jye*!2; zL_t(|ob8xPa>F1DhGEk+;s$VnPJ5xOa{nU~Az`oqn`Ce^PNX#EVd)D<_SpT^?{xcC zKYq3e^PiZOzsUfAd#>Yg%nSrqM&!Qhc=Vaph8VCM5jyyZ4Z^I2Cz#-n>O!>Vj_1Z> z2k=0w=t1nGbvoZr9&t zE$0*aWj^C)G@q&5v4e4V9RO_Vo|u(AdLK0*AHp0lVa{fr@hl#;+qmm1nP2y7Fz@%< zC74&KyD)_*OkoOBn8Lgc^Ne@etGv$(Guu`+TL0HNA~V&@zOb|&^(CRqf7}t4uyNp> z8O9gXKW@<2NVQC|W9mz}wOsYyPvF*xC4Q5MND)V_LGp(6z zVaXPCACZ|JxsP1#?#egs$Q(6c&SswREI#9%;gw9$mnPc@NMQ<7n8FmMFopTqOqgy) znduu6=7~%l{{Zk9zr~4ie}tt?;mi5#Q!~TC=r9R=X1OGqS@}n%*5Rmum}c>bGn!9e zqwvzBQSjH=>@f`>%Vege-!WRH6KMoA(zu!E42wUp6H^%q4L89NliZA=Js4VEViI)C zT-K=!&4f18Y|F%GW&&r}&}@VbFpW|*Q>PKEn4NXTy7R_N9JTU^LNzM#NpV#^Q{CzM zHPpnL|G-%(=`Hp2dH)VoWIu&xuL^0000Br;9LJ|nnJFr?ZaAltOH)GA53Mbk((x;?*@n!TpHmkplzy?f#=Sb`XT`Wk z_T9|AYje3V+0~db#jIOti6M&IF~73i-P<|$^zZGQ`^WP<@6UPuc%J9|dB2`)f8S#e zBd8Gw1cG=S_Xq%i^z3zdL4UPwcK->Ir&}!jy#vu&tyU+s+BPOL{H9L*GuqnPF12e% zbfw<;0N+y})adg_5Xhj>%i~C3%AF5)2>HWy8_*o)qWOCer-BrDbRL)&W|}&#>ypDe z+grWYeA^sq?klR>)JbG0#mH@cPR`6fvlg++i9u2XjO3j#BEVd#@{=Nf;qkL^$<6V$SGB1-KMw9y< z;0eW!1kUQ>ri1tnmvP>x2{1H_aUC7v2bCnL2XTt0zqW!Yrx;Y1b!w{-*t-W2H zRT*Lx?--Rrp0lnbVv(=zum$PE6mn6E)0B1Asb8!fRrUGDh*Rx*-cWn*Q$M`Dr|yze zw_M>-%9K9SPhztf$~}Rv8K*ZA@Ikb*n93c|Xc$QnQmQag&%Mjw&s8B$TUHjPkpQjg-oG;-^Wf& zKt&3t!#plOlVJ57hR)54tbjqVS^JNTa5ES~6E(|Pf^maH4!?;tdhPKuH_o|x`@X?Q6>nR^lv54Uu+ z@LO0`J~+YGQ{2L)zN5O;*$~UHweS*7ecz`Sn({~4I&hfkiBDd-)U@F16l5n)L`LRk zH$EE^wcOAQ`r2TA8RZ+a^g84b((KZ@kp>nySf--Mn!Ja8W%gIIhaiBQYAmkWYM^hy zzG8RAuC=?;3nwxFtc|uvrW1pq1@MqAS&locofU)=xnZPK<65(uFUgRLoFZ!Q;O@8- zF@3XhfokFkPK1Vqb%y7_pI5Uh-|<@(Jg;9O%;}Isj>;Cn#z0ycKS03|V&G=8PPr35hVBrMiRTFsBxxa)l6W&Kk*fAw5z1 za#&n4fSG)9h$D68awHm3w|#52Y%hn%$i}E#PehkKTdfg`PRG1`3Pt*;qBxPm@uP#W z^t-Cr&h;bPH|E(gdpA%73(@kP2`BMG`Q+49Tt~yAscOG?6B#(c$-xlnt&%9XtMxoB zMag8ay{Bvh12O!DTh@6|fW38ThD@Bec_92CB58kwN+MN9gmsLihleTQmRxMi4AoW$ z^=UGcC#B&tx>)&Yxw=INhWe!&151ZBT5gXb;$L_)7L2viP}&d}qWjN5UT9yBdiU@f Fe*v>R + +ParadisEO-MOMovingObjects: Member List + + + + +
+ +
+
+ +
+

moILS< M > Member List

This is the complete list of members for moILS< M >, including all inherited members.

+ + + + + + + + + + + + +
acceptance_criterionmoILS< M > [private]
algomoILS< M > [private]
contmoILS< M > [private]
EOT typedefmoILS< M > [private]
Fitness typedefmoILS< M > [private]
full_evalmoILS< M > [private]
moILS(moAlgo< EOT > &__algo, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval)moILS< M > [inline]
moILS(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval)moILS< M > [inline]
moILS(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__moTS_continue, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval)moILS< M > [inline]
moILS(moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__moSA_continue, double __init_temp, moCoolingSchedule &__cool_sched, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval)moILS< M > [inline]
operator()(EOT &__sol)moILS< M > [inline]
perturbationmoILS< M > [private]

Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/classmo_i_l_s.html b/trunk/paradiseo-mo/doc/html/classmo_i_l_s.html new file mode 100644 index 000000000..9b58f1675 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/classmo_i_l_s.html @@ -0,0 +1,479 @@ + + +ParadisEO-MOMovingObjects: moILS< M > Class Template Reference + + + + +
+ +
+
+ +
+

moILS< M > Class Template Reference

Iterated Local Search (ILS). +More... +

+#include <moILS.h> +

+

Inheritance diagram for moILS< M >: +

+ +moAlgo< M::EOType > + +List of all members. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Public Member Functions

 moILS (moAlgo< EOT > &__algo, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval)
 Generic constructor.
 moILS (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval)
 Constructor for using a moHC for the moAlgo.
 moILS (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__moTS_continue, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval)
 Constructor for using a moTS for the moAlgo.
 moILS (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__moSA_continue, double __init_temp, moCoolingSchedule &__cool_sched, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval)
 Constructor for using a moTS for the moAlgo.
bool operator() (EOT &__sol)
 Function which launches the ILS.

Private Types

+typedef M::EOType EOT
 Alias for the type.
+typedef EOT::Fitness Fitness
 Alias for the fitness.

Private Attributes

+moAlgo< EOT > & algo
 The solution based heuristic.
+moSolContinue< EOT > & cont
 The stopping criterion.
+moComparator< EOT > & acceptance_criterion
 The acceptance criterion.
+eoMonOp< EOT > & perturbation
 The perturbation generator.
+eoEvalFunc< EOT > & full_eval
 The full evaluation function.
+

Detailed Description

+

template<class M>
+ class moILS< M >

+ +Iterated Local Search (ILS). +

+Class which describes the algorithm for a iterated local search. +

+ +

+Definition at line 25 of file moILS.h.

Constructor & Destructor Documentation

+ +
+
+
+template<class M>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
moILS< M >::moILS (moAlgo< EOT > &  __algo,
moSolContinue< EOT > &  __continue,
moComparator< EOT > &  __acceptance_criterion,
eoMonOp< EOT > &  __perturbation,
eoEvalFunc< EOT > &  __full_eval 
) [inline]
+
+
+ +

+Generic constructor. +

+Generic constructor using a moAlgo

+

Parameters:
+ + + + + + +
__algo The solution based heuristic to use.
__continue The stopping criterion.
__acceptance_criterion The acceptance criterion.
__perturbation The pertubation generator.
__full_eval The evaluation function.
+
+ +

+Definition at line 46 of file moILS.h. +

+

+ +

+
+
+template<class M>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
moILS< M >::moILS (moMoveInit< M > &  __move_init,
moNextMove< M > &  __next_move,
moMoveIncrEval< M > &  __incr_eval,
moMoveSelect< M > &  __move_select,
moSolContinue< EOT > &  __continue,
moComparator< EOT > &  __acceptance_criterion,
eoMonOp< EOT > &  __perturbation,
eoEvalFunc< EOT > &  __full_eval 
) [inline]
+
+
+ +

+Constructor for using a moHC for the moAlgo. +

+

Parameters:
+ + + + + + + + + +
__move_init The move initialisation (for the moHC).
__next_move The move generator (for the moHC).
__incr_eval The partial evaluation function (for the moHC).
__move_select The move selection strategy (for the moHC).
__continue The stopping criterion.
__acceptance_criterion The acceptance criterion.
__perturbation The pertubation generator.
__full_eval The evaluation function.
+
+ +

+Definition at line 62 of file moILS.h. +

+

+ +

+
+
+template<class M>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
moILS< M >::moILS (moMoveInit< M > &  __move_init,
moNextMove< M > &  __next_move,
moMoveIncrEval< M > &  __incr_eval,
moTabuList< M > &  __tabu_list,
moAspirCrit< M > &  __aspir_crit,
moSolContinue< EOT > &  __moTS_continue,
moSolContinue< EOT > &  __continue,
moComparator< EOT > &  __acceptance_criterion,
eoMonOp< EOT > &  __perturbation,
eoEvalFunc< EOT > &  __full_eval 
) [inline]
+
+
+ +

+Constructor for using a moTS for the moAlgo. +

+

Parameters:
+ + + + + + + + + + + +
__move_init The move initialisation (for the moTS).
__next_move The move generator (for the moTS).
__incr_eval The partial evaluation function (for the moTS).
__tabu_list The tabu list (for the moTS !!!!).
__aspir_crit The aspiration criterion (for the moTS).
__moTS_continue The stopping criterion (for the moTS).
__continue The stopping criterion.
__acceptance_criterion The acceptance criterion.
__perturbation The pertubation generator.
__full_eval The evaluation function.
+
+ +

+Definition at line 82 of file moILS.h. +

+

+ +

+
+
+template<class M>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
moILS< M >::moILS (moRandMove< M > &  __move_rand,
moMoveIncrEval< M > &  __incr_eval,
moSolContinue< EOT > &  __moSA_continue,
double  __init_temp,
moCoolingSchedule &  __cool_sched,
moSolContinue< EOT > &  __continue,
moComparator< EOT > &  __acceptance_criterion,
eoMonOp< EOT > &  __perturbation,
eoEvalFunc< EOT > &  __full_eval 
) [inline]
+
+
+ +

+Constructor for using a moTS for the moAlgo. +

+

Parameters:
+ + + + + + + + + + +
__move_rand The random move generator (for the moSA).
__incr_eval The partial evaluation function (for the moSA).
__moSA_continue The stopping criterion (for the moSA).
__init_temp The initial temperature (for the moSA).
__cool_sched The cooling scheduler (for the moSA).
__continue The stopping criterion.
__acceptance_criterion The acceptance criterion.
__perturbation The pertubation generator.
__full_eval The evaluation function.
+
+ +

+Definition at line 102 of file moILS.h. +

+

+

Member Function Documentation

+ +
+
+
+template<class M>
+ + + + + + + + + +
bool moILS< M >::operator() (EOT &  __sol  )  [inline]
+
+
+ +

+Function which launches the ILS. +

+The ILS has to improve a current solution. As the moSA, the moTS and the moHC, it can be used for HYBRIDATION in an evolutionnary algorithm.

+

Parameters:
+ + +
__sol a current solution to improve.
+
+
Returns:
TRUE.
+ +

+Definition at line 119 of file moILS.h. +

+References moILS< M >::acceptance_criterion, moILS< M >::algo, moILS< M >::cont, moILS< M >::full_eval, and moILS< M >::perturbation. +

+

+

The documentation for this class was generated from the following file: +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/classmo_i_l_s.png b/trunk/paradiseo-mo/doc/html/classmo_i_l_s.png new file mode 100644 index 0000000000000000000000000000000000000000..88a50f4fe3382502a7ab3060b3f1f02e9f4ac9d4 GIT binary patch literal 455 zcmV;&0XY7NP)4_3tuqn#@0AABiVM^@tfzH8BPX-cyZWRq2K6d)mILZgqHFfEnaqh%&j+|Nl zJ163Grqka!AKSB>ZF@b+dD?s}XF1DR&T^LXJO@+488;>6<=l5{ya$xawBK{A$vtfN z#=E{F#|mIkoZNibaS+1kdl@|h-dgp}If+n544BFpLMI&Kkei(?Z+O*-bw=ad$|ucN xtWVso)+f%F{En;jWACk>E3usa>P-6I`2lGz0@ooW#r6OI002ovPDHLkV1m`d(rN$z literal 0 HcmV?d00001 diff --git a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html index e909f3e3c..513f7e54a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@
-
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png index 9cb9fec170c3e9eeb1355d4cccde67b34ec76d9a..cfb21ada85b68fd3d2031a0700b35520c2da5509 100644 GIT binary patch delta 509 zcmVpOv9}>|<}` z{kV&D@K1y55Q*KGJ*<;=avxaE=GEjhur5=#fyIhq2{0e4PS-0|QO9yGn5&`NB~>3p zF(HRb;Xskt65n32(FSnP{jxD1f6C%ht0nSfu$>mq!6|?Sd3X!ti(v87lGTbEcyq;) zp#<2wLM9sLV%s#fuJDS7u82N1aJIs*i<`mUtX|FdH{iRhgP#H3?eo9E4qK9c1^D#& zV&KE+^kU!_?1~QV;12HK4({L%?%<2Y`xq74XLlX^WH2TJU>Vxn%%7hy z0muU50|yRNANv0U$Ym@E@(X5gcy=R=fq`YSr;B4q#hkZu0_QC<;5qg%b>8ed3U{U7 z#AVEX_Rl?HlG;)QEiaMXll{}#ytwNxwFLgG{T z*>Pr+SM2l}mLrp2|FQ*I&APb1>7skB!Mwl6O4`}VYk$7K6l-fx_uqE*gMC&Be}4V5 zlYY3aD&ftdG@!DBFBT_!2{ibnAyF&RV+Yp_6Mn(klU~oT%Q?2@noN%zP@b2jS&F{Lj zg|e4b_k1m@JH4W}Mq2)<+do$2lfD0vUO#MARn~g;=FiG#hOLfe`w~K~Gd$=j+~%5b zJ*i5wcST=Ert&A_^Tliban9V6v`V2a>U*1@RCcS((##3Y*LJ$C+QwsjscECiguI24 zPRq|obZR9R1B2<>n(W6b#HQ+)&0=+LJUpwP+s#q4=jt+Lb=JzG9xImTGhVVi*K?C6 zHsa8x9_1*OoYOKwTfSTrjyE>yIcB)MN4)UNmZT-6GMgnc%p_F*nLd4XY*fO&3cf}raKI~zjKZR+^PPgPI zlP>?zBwoA&Y6zinFzRrg=Z56=Hl?`zJt z-+S-gWj{iIk@zdY=6CN)zMuOO|1X>$ykj-dvOKVm|7;z5cl;Y2Ab9Z)ZFneOmZwt?eC`Z&&4> z8!f8)-CDIiq_1wQ17S~30-_kjg9=vU$rSqz%&nrFH-8Am?a=UHj zTsiky<%!2VQ_eDOk#$eDG45N^o%YbN_`(^pg~gvY?)aOr?sZYEj+w<rqSiX$?nA{#?TZ6JdV_0&;kxGHWUzpr})bO7C zzh$l|+v0AZdHx35m>F_%WtK3w$3=aa6IEH5b4$+ViQ}=5&Jy>_Sy68aWnQsebg|jj zXIQASY{$}x?5YpM(qtO@d77qGR6qJ!sN{LcxlN7xN48{Q%Bjo)GZJRq%vA7@nHe>& z*(bBoXRg~@#e_*Lmln@C!l0k1qmr!pi2Zr;C7mg$$vO)@Jy^KO(RtO$4f3B9l7q}7 zo>?@V`OCWaT*1jH?FzCIlXKV9PxAYfCe!SQ-7EKjCd6_ zFXp<@`K9ZQ2VMW9ezr7rUB8V-e{k||p<|*S@5=7h1p0UWzGW4=5#jcaaq5EXa~XfN Rt^mt222WQ%mvv4FO#m^ZbiM!p diff --git a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html index 80a84b55f..c3fca6227 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

moItRandNextMove< M > Member List

This is the complete list of members for moItRandNextMove< M >, including all inherited members.

- - + - - -
EOT typedefmoItRandNextMove< M > [private]
functor_category()eoBF< M &, const M::EOType &, bool > [static]
max_itermoItRandNextMove< M > [private]
moItRandNextMove(moRandMove< M > &__rand_move, unsigned int __max_iter)moItRandNextMove< M > [inline]
num_itermoItRandNextMove< M > [private]
operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline, virtual]
operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline]
rand_movemoItRandNextMove< M > [private]
~eoBF()eoBF< M &, const M::EOType &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html index fbb1ed73b..28aaa1c27 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moItRandNextMove< M > Class Template Reference +ParadisEO-MOMovingObjects: moItRandNextMove< M > Class Template Reference @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -38,9 +39,7 @@

    Inheritance diagram for moItRandNextMove< M >:

    -moNextMove< M > -eoBF< M &, const M::EOType &, bool > -eoFunctorBase +moNextMove< M > List of all members. @@ -111,7 +110,7 @@ template<class M>

    The constructor.

    -Parameters only for initialising the attributes.

    +Parameters only for initialising the attributes.

    Parameters:
    @@ -145,7 +144,7 @@ template<class M> - +
    __rand_move the random move generator.
    ) [inline, virtual] [inline]
@@ -163,8 +162,6 @@ If the maximum number is not already reached, the current move is forgotten and
Returns:
FALSE if the maximum number of iteration is reached, else TRUE.
-

-Implements eoBF< M &, const M::EOType &, bool >.

Definition at line 52 of file moItRandNextMove.h.

@@ -173,7 +170,7 @@ References moItR

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.png b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.png index 52d789f145d7d145d603b66de936fa5f1454de94..574beda2c5be0329aa0b7d4884736a2bf472f24c 100644 GIT binary patch delta 472 zcmV;}0Vn>62>$~iiBL{Q4GJ0x0000DNk~Le0001+0000`1Oos70Q_JY$dMs4e*u+A zL_t(|ob8oKZo@DPMa50lq;BAxplC1DRqlU;lK)$ZJOyqlplKn>uuMvP<{-oAqo=&3 z_iINPxZb#oi;t7vrp=Ch>jBPMT!y~J?OIp39I;sT*>MKN=s5Wm!@h%a-yB|n!yK1C z_%s`?Glo`TkE5F!Oazm6a0sg4e^$H$T%>JA97>R3^V~C2q;fQ#efTU=3vDsepN7~5jl1Du9ugofw@VJU7(6-&bR(vW5ht;7}_w$lf- zyL$;|(H$IuDmd~sxP-(SFT6px%54#|e@|BGty0t8;wq=&*w!U3La_zzAi4$@L5eaP zWzukv)YJ}RTRXI@be0{RF3%l08{H}`b@kra8Mkxpel7zya3^tne~e$C0002M1Oos704^vvNRc5ke*>RM zL_t(|obB6LlA|yT08sm9zAfEAoM39^Lj9HdA7QW-F9Fh!I76q9tC!$5JY*~B1Qp@$ zY3+CTGo97kcKcxifM$zIFa8I+H>mW|a_Bgl=6L7mkR>F-+yj`q5wpz$c+7A+gR@{Z zlJw-W0ghWXY5xoywt-`}(-0eVf4%44=`Hqr_%`m|mO0NeKwT~lvQc8%wmBE@K+Zk4 z-lPxl&VJW=H+fFT#N0!Y=e*to^sYP~-`sZF?RVQ}zDItkeZ98(r`o@6*R*f9uS?oj z&2zWicH3>Y-FDk;x7~JotbOKZ|Epeaar;a=mm8>5x=6n#TD>5S%{R&AfAf49{r>7X zG{ft0SM09jkV)Qiy$peJU_LRD4w@D<12S~m=F|Sx)={}K#^r*}CgW@Ith1p}TDufK z%*p!^<*%vExs8&l2+#MtDO-28)={Q9=P=b0iygAFK}$?>%4TDe0JUIK>`B(Uv#n~R zM`(A%8jsijZQNi>r2**ye;S*#Hc1kHA2$!MYMq_=oz1w$J#}*qy{&83*risrViT1* zT2rIlj(c^zwY*5S;AK=@Z=2b|s9n|@ZNWF!+cFT^EHrxpEDt14`E0;!;zW_>w?$v` z9PA{v^8EXDq`JMRg>Mz>cG?H3`iobX&GR1rdXBqi>8JcJar+APf0^%*&-`rgskYb0 zu4P{}&)s(0ZMWTa+ikbqcH8Z-_L-mkuX?@3?VoHnSBUM}{e4^S9bsc*TYai;>%A}7 zTovKUnA}XmH3CsUZ=*7Ayp150j(QUjS#7M8P{g#V)vkM~cG(j)Cf8q%IH!lmpDqLP!~l z5Moy6?kJn{1|(7V$;!XR*pQh#s}gt00Z0B3b(6nR&|!gpiOIck4$s9MgW0m)sWWq! zVQEXaWb~K9v=C7``yiLx7~iXed2rMe|iu4 Un9C2u;Q#;t07*qoM6N<$f`PLPD*ylh diff --git a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html index d0503e705..b55f247c4 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -33,12 +34,8 @@

    moLSCheckPoint< M > Member List

    This is the complete list of members for moLSCheckPoint< M >, including all inherited members.

    - - - - -
    add(eoBF< const M &, const typename M::EOType &, void > &__f)moLSCheckPoint< M > [inline]
    funcmoLSCheckPoint< M > [private]
    functor_category()eoBF< const M &, const M::EOType &, void > [static]
    operator()(const M &__move, const typename M::EOType &__sol)moLSCheckPoint< M > [inline]
    eoBF< const M &, const M::EOType &, void >::operator()(const M &, const M::EOType &)=0eoBF< const M &, const M::EOType &, void > [pure virtual]
    ~eoBF()eoBF< const M &, const M::EOType &, void > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]

    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html index 81bbaba42..0490644cb 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html +++ b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moLSCheckPoint< M > Class Template Reference +ParadisEO-MOMovingObjects: moLSCheckPoint< M > Class Template Reference @@ -8,6 +8,7 @@
    -

    moLSCheckPoint< M > Class Template Reference

    Class which allows a checkpointing system. +

    moLSCheckPoint< M > Class Template Reference

    Class which allows a checkpointing system. More...

    #include <moLSCheckPoint.h>

    -

    Inheritance diagram for moLSCheckPoint< M >: -

    - -eoBF< const M &, const M::EOType &, void > -eoFunctorBase - List of all members. - + @@ -122,7 +117,7 @@ template<class M> - + @@ -148,7 +143,7 @@ References moLSChe

    The documentation for this class was generated from the following file:     -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html index 826f6c3b3..1b7bc40f7 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

    moLinearCoolingSchedule Member List

    This is the complete list of members for moLinearCoolingSchedule, including all inherited members.


    Public Member Functions

    void operator() (const M &__move, const typename M::EOType &__sol)
     Function which launches the checkpointing.
    void add (eoBF< const M &, const typename M::EOType &, void > &__f)
    void add (eoBF< const M &, const typename M::EOType &, void > &__f)
     Procedure which add a new function to the function vector.

    Private Attributes

    -std::vector< eoBF< const M &,
    +std::vector< eoBF< const M &,
    const typename M::EOType &,
    void > * >     		func
    void moLSCheckPoint< M >::add (eoBF< const M &, const typename M::EOType &, void > & eoBF< const M &, const typename M::EOType &, void > &  __f  )  [inline]
    - - + - - -
    functor_category()eoUF< double &, bool > [static]
    moLinearCoolingSchedule(double __threshold, double __quantity)moLinearCoolingSchedule [inline]
    operator()(double &__temp)moLinearCoolingSchedule [inline, virtual]
    operator()(double &__temp)moLinearCoolingSchedule [inline]
    quantitymoLinearCoolingSchedule [private]
    thresholdmoLinearCoolingSchedule [private]
    ~eoFunctorBase()eoFunctorBase [virtual]
    ~eoUF()eoUF< double &, bool > [virtual]
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html index 11bb16691..25a999750 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moLinearCoolingSchedule Class Reference +ParadisEO-MOMovingObjects: moLinearCoolingSchedule Class Reference @@ -8,6 +8,7 @@
    @@ -136,8 +135,6 @@ It decreases the temperature and indicates if it is greater than the threshold.<
    Returns:
    if the new temperature (current temperature - quantity) is greater than the threshold.
    -

    -Implements eoUF< double &, bool >.

    Definition at line 41 of file moLinearCoolingSchedule.h.

    @@ -146,7 +143,7 @@ References

    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png index 51f1257538ad7247802e98643b97b19b6d5b4174..3821b70aa47ed0efa81c881a2f12938ed5cceff1 100644 GIT binary patch delta 455 zcmV;&0XY8K27?5U7Ya}W0{{R3Y;$7=ks&jG0hvieK~#90?UhS%!!QVj#incE26AuE zUMQ>F{|E&MJ!3m|tG4b`cp@Y8>kAl-?cN8Qds~Lu>jZum&=V(@eHSeAX0{LHBIG`J z2I#%+B9qdxNKTR=tLFn+7d^){jmWC{n?O#gkdUf%pg0I91lcqcZ(J4e09<$tXr2;( zSw%VWRbW5_AW;DleHO?CSSMQJwt%*`0a6o8kM>B(+BH3LRhQ)=pMnasE_;5`sEIuMJbP83U1R!TM;R%KOBtgV&u^Q?i|HXGC;SIjzm=Ng#{{I@;gx$KE#o1vvUM`T@;kCmy3sV-5fS002ovPDHLkV1g{N$?O0C delta 802 zcmV+-1Ks?C1ltCX7Ye`x0{{R3aTRq$ks&jG0`W;iK~#90?V3??;~)%%&C5O`-9X+O zv={1A?tg?ufIv8y+78_$Q>jx2Wbs9yOdS4U`J8Oa$2!&i8t_Mf0HAtQym%GZ4y59x z`_ONI6fz5WU>uG_$R0p;BQh`s#F%41ri5VvL`oih3y2w}F757>;%NThQYgk z9tVaoI>Q#2rp&ogQ?zl0>lhf<7rVvzb`2>vaRWTHhN{Yhaa{0Fs&ZUI0yVBDr}fsnR;^2~s&)@UH8VOwC)6$A*;2}N-c%|T5W)+$G^ zmaq#1$b*Vgi5S6KH7gAiq5uJOhOqX4Spr%Sd%#RA8LrKgcQQ;II+EdV4MDFV$|4Te zFqbRLYQ3v6zvwE1kVjQMYx|nyHQ+#!e77$L16~78e~eCl&_4@ky3GWe%`>2X0S#zC z0~*kP?+Bd!gY)%&V;e9TRqdwAB-vT}O>YcThiY)^JOd=&@yixn&SOy8yC=pfqOG9O z2i8M16$p(}miEY$xoRXjPCfm9MB=2i$T{gW&Y;R88=m$$59}T%dIZ=#PV^A)s2Oku zaQb6(`h)&iK+|m|*leBw4QN0E8qk0Sd`BQmw#Cn#h%?|^pbP&SzJucMZsV+d)w=_3 z%vY!1I`@H&uMSd%&c*f;vT!bire4U -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

    moMove< EOT > Member List

    This is the complete list of members for moMove< EOT >, including all inherited members.

    - - - - -
    EOType typedefmoMove< EOT >
    functor_category()eoUF< EOT &, void > [static]
    operator()(EOT &)=0eoUF< EOT &, void > [pure virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]
    ~eoUF()eoUF< EOT &, void > [virtual]

    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move.html b/trunk/paradiseo-mo/doc/html/classmo_move.html index 774bacf35..83148b90a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMove< EOT > Class Template Reference +ParadisEO-MOMovingObjects: moMove< EOT > Class Template Reference @@ -8,6 +8,7 @@
    -

    moMove< EOT > Class Template Reference

    Definition of a move. +

    moMove< EOT > Class Template Reference

    Definition of a move. More...

    #include <moMove.h>

    -

    Inheritance diagram for moMove< EOT >: -

    - -eoUF< EOT &, void > -eoFunctorBase - List of all members. @@ -61,7 +56,7 @@ A move transforms a solution to another close solution. It describes how a solut

    Definition at line 23 of file moMove.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_expl.html b/trunk/paradiseo-mo/doc/html/classmo_move_expl.html index 4048a2ac2..431ab13da 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_expl.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMoveExpl< M > Class Template Reference +ParadisEO-MOMovingObjects: moMoveExpl< M > Class Template Reference @@ -8,6 +8,7 @@
    -

    moMoveExpl< M > Class Template Reference

    Description of a move (moMove) explorer. +

    moMoveExpl< M > Class Template Reference

    Description of a move (moMove) explorer. More...

    #include <moMoveExpl.h> @@ -38,13 +39,11 @@

    Inheritance diagram for moMoveExpl< M >:

    -eoBF< const M::EOType &, M::EOType &, void > -eoFunctorBase -moMoveLoopExpl< M > -moHCMoveLoopExpl< M > -moTSMoveLoopExpl< M > +moMoveLoopExpl< M > +moHCMoveLoopExpl< M > +moTSMoveLoopExpl< M > -List of all members.

    Public Types

    +

    Detailed Description

    @@ -59,7 +58,7 @@ Only a description...See Definition at line 21 of file moMoveExpl.h.
    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_expl.png b/trunk/paradiseo-mo/doc/html/classmo_move_expl.png index 66c1602bb04d70818190b561768c8297e0e2f84b..1b27438a76a121d08784a4aedc4de6fba1e03040 100644 GIT binary patch delta 948 zcmV;l155ne4%Y`EiBL{Q4GJ0x0000DNk~Le000400001p1Oos707^FwW|1K?e*bX~Z8N)V@yO$GRgR}A zp-e7=Km!hkX6eF|#=i}!bpUGL@Gs1j0C2`Q?C6jefsDj`LckfKURQ6;3P5>iwNDXN6}qyG44)bCcq4>8nuw%!$0 zQ5AKmkiW}*(R0q{rr)-|5;Y;Xebjr?Z`)sh8bX>pxI8s9;BXYR#FC=vsh7+`vg(NH z9l-j89Ht^+TWznpGP{%1=8VGfuf8wQqP)Ax;iYg&R zm5`!JNKqx!8}%k60n|?cpGM{mdR(V(N^dw-Pm3zfON^PN=85eOFXPJzH0x2K;jFU;)(%)j_d{qp|>BjF)Y+s-|1o zuTi03;#dLII;vQNe*vWzMS;Z%b^Xuor9Gm~byHYCF;D%~0;(C6{Sqoqjp5BFbO{p# zE`ITOf<08Oo0?G%6;Rz#vtNvXk64UzcNqwddgKd+X#(_w_K~ANs9ZJ!>GA-zp@8a+ zn*DNZ%|B2f2oCGvsE41KQE8GT>KxTW1ytLp*vrLC@X;tLe@k#i&9@!xITcz^pDv)< zMD;Z)Eu;!{E{gIC)Sal}4sfV|Y9E!IU~eN=;YyjS(Z{V^;NfOs~vz*iyhz@HI({%;kVU#t6ob{zXfW8^e-z#{qIqmpKY7<+{1Od{sM(@ WTFj-d;Ya`g3IG5}MNUMnLSTa2?zFxD literal 1884 zcmbW2YgAKL7RLi(C#CZ6!5F|Q)`m6(Z_C3nK`iAV%3~oAAQHF=A__8s=na)XM#L(h z26QNmf)Jpf7~oO~N#!OWj=VGo1ju6mjq)&%5Gh0;20|ufb(XF*{nGhxerunz_B!Y6 zv-f|W+@QdHCdO9AC=|-XcfWTC3S}6jx79{#^yJ%M^$RFWP(bKjold7Wb-GptBl?=& zS{<#et?B>Ljq9fdP)HyF_3bOkF%;^9IbUy&(6hIcB{4~re>3;7ra3>jmmDoKtN{~x zo%;Qnbn8VE4Ycy9@9Sf&Tr%pN3`R@|ZdaeJPf6kK8W+2N+&_mJp5rfeb_znadV%JH zYdwC$>_)H$6M1qdM6;2&!b4sabAA|FLeO^xEJ%e;!Ss*5OsxEL)Bbx`kfS?AW{JzoA*(19NZ`UG;%B+SN~#BV8Gj~ zzvo-oB>K6r+*7T6n+Bn0jL0!R*JPIgXnEHEiTmFJEBGx&I?0B2r&si23Fn_uHlT^x z0awR#HQc~b$*q~;IuBf$8MrVDMbl0D)X>2q`y&y<$m8}7CRtECc{+un@FW61T&(T> zSW+3|w_`R)>=HJ%Jai-YB?wJ44MxyegqZI2F^9RAUi!tr1NcSt32=&c0LciH9+@{TaOPA zo@Z(nBIm&bbLZQE1;Lm2XB~#7TamdKrt>Ywk(<69BBn#h<8<0p_m@DVSS!Qbm*c7$K_k*nMPmS8teB4L&|r+Qr6XV-q^6`k|;JHcdM7e;dUFV z+~f+wWXJT4@XmRwrOr2or6P;U!8QM2Gg6v6Rvem9&W$l>*AEJgc3tKLj2t){i=G$^ z6Kh(ij3vaU1JsL)8tyh}e?+%m@6C9~oq^ zSODFOBKXG~J}%z%D&oT3d}IFH!;PXONeATZ!SyvtNVPY*tw42p8TvTnqKvk5O%KMHoHxiuFq>R+&a2(IK0 z&p?koHNeTVaO*J9TD5B-kW9wfQ?If5uwey2!MQ;HUzS|!fMUj;!-~^s{B8(jld(>p zoM6xV6K;`nM-@d>;#TvqgOj7zFq9g~(RFm$k)r_!s;4Y*4PnVZYrm@c`#EsypKT2Ta&}6248YRT6v|0<4PkU61ZpZ^dQS$+$dahOIKHU2D&Y(16&#Hh}PcxBlv6W$b2+P88Mz!%!u`UvVUz9P0@b9GH4OjWtN z-L*@q3NSvM^=71JA`Zmm9h4^WtmDgTs4Lkr=-*W^W-x^KxT~zrPBBzRZoi%)T{d&? zD}0m_X-B2=2#erz4OIiXIm%@)sB+Il{I-bb+Z{@)CBdOPVkfzO-4QEdUteIzBfI;g zV+5@>`{8G+NqkW+d9SXwnIzw0|1?WuU0OCPiyNHHo~kA3ze1Gn-av2IGdk-(;*yhP diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html index c718ea0c3..64b2accfb 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMoveIncrEval< M > Class Template Reference +ParadisEO-MOMovingObjects: moMoveIncrEval< M > Class Template Reference @@ -8,6 +8,7 @@
    -

    moMoveIncrEval< M > Class Template Reference

    (generally) Efficient evaluation function based a move and a solution. +

    moMoveIncrEval< M > Class Template Reference

    (generally) Efficient evaluation function based a move and a solution. More...

    #include <moMoveIncrEval.h>

    -

    Inheritance diagram for moMoveIncrEval< M >: -

    - -eoBF< const M &, const M::EOType &, M::EOType::Fitness > -eoFunctorBase - -List of all members. +

    Detailed Description

    @@ -56,7 +51,7 @@ From a move and a solution, it computes a new fitness that could be associated t

    Definition at line 24 of file moMoveIncrEval.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_init.html b/trunk/paradiseo-mo/doc/html/classmo_move_init.html index d06901e1b..9a860a89c 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_init.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_init.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMoveInit< M > Class Template Reference +ParadisEO-MOMovingObjects: moMoveInit< M > Class Template Reference @@ -8,6 +8,7 @@
    -

    moMoveInit< M > Class Template Reference

    Move (moMove) initializer. +

    moMoveInit< M > Class Template Reference

    Move (moMove) initializer. More...

    #include <moMoveInit.h>

    -

    Inheritance diagram for moMoveInit< M >: -

    - -eoBF< M &, const M::EOType &, void > -eoFunctorBase - -List of all members. +

    Detailed Description

    @@ -56,7 +51,7 @@ Class which allows to initiase a move. Only a description... An object that heri

    Definition at line 22 of file moMoveInit.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html index eba8839e0..8c3ca5fb5 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMoveLoopExpl< M > Class Template Reference +ParadisEO-MOMovingObjects: moMoveLoopExpl< M > Class Template Reference @@ -8,6 +8,7 @@
    • Main Page
      • +
    • Namespaces
    • Classes
    • Files
    • @@ -38,13 +39,11 @@

      Inheritance diagram for moMoveLoopExpl< M >:

      -moMoveExpl< M > -eoBF< const M::EOType &, M::EOType &, void > -eoFunctorBase -moHCMoveLoopExpl< M > -moTSMoveLoopExpl< M > +moMoveExpl< M > +moHCMoveLoopExpl< M > +moTSMoveLoopExpl< M > -List of all members. +

      Detailed Description

      @@ -59,7 +58,7 @@ Only a description... Definition at line 21 of file moMoveLoopExpl.h.
      The documentation for this class was generated from the following file: -
      Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
      Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
      diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.png b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.png index 82d725cec160ec109fdc0604bc0692bb3176ad12..3fc99c0f6b664ce32dcff9c3a63462c1b96c8d4d 100644 GIT binary patch delta 989 zcmV<310wv;4}b_EiBL{Q4GJ0x0000DNk~Le000400001p1Oos707^FwW|1K?e*>0D zL_t(|ob8-#Zrd;nhGi7!Z%H?hdx2pCcAf$Sa{nVtBqc{*j+Mc*qLyzq*s>Yw2}7yN z(7a0Z>+R3!dSdpc^tPU@4?z`FL2b%~zuVXt8%}LIVjQXmG6i~pT0~rq>YPV$CV;>R zJPe}x8_r*U8B}Wk)_P<|Cu=xBe`T$+FhWF%AmlNqt8Jq~uTqUI6*Hn%te2y%mQMU} z^_U11P)&@at0n7DR2$d3O{*GF$5%DH^8guo6_!=ftN0k*t8wAO3E;rkH$kxj1k_3| z^3$rxCa6CLwMT*~sDe7rhwE;=j|S-1M5wpV(FEO^2lf4S8;#JbiBM-+e^!FZAwlJk zpmIo1IV7kY5>yTeDu)D>LxRd7LFJI3a!61)G#+&^r;81Bf{bj51yxXaR3=`EYx#Y@ zU+8eE+woVTdIYn3KN;zE`~|4X;wN8Bm>N#tVW?`J#aC0)$cHUHY9OjM0INOnLMJL5 zR2&%^`OAxjdx%K!gnSjMf6_;&aDZN=ifbxnM7^_KhpIH4_@nY*1uBFFR1=>^S2xx% zs9LESb%`UBp^m6(pn^NiUWH|q^eR5C@71{Qam_Ed^nG`xJAiMAVh0GQbw)PS4sCUN z{3JpBuBgK@vLzN&LFLgzAFjJK{=Y1`H4*AOzq~XN>O{Z1G!g1df6GcxIV7kY5>yTe zDu+g+-k8LI`pJ+}@w@|{3^|pcGUQZ(%8*kDDnm{ss0=xkpfcoCg36FneOJ`(Z^wT1 z2L6Jy-CxiB+YO+8pZ@J+LOnh0hoB1T*}4MN;U8mahpOy3M}AcmssT41LoO_-Nlb1S zZCZK@AR7wPD$wUsV&;mZ-Fl3e?SY%4VoLRmB~k=}?vS z>Lb6Zebkr)M~z;EJ87@3c5U@)+yQ7`tsJV-9pJ#PDo5S2*mYa__!65^E_W?;RP~e00000 LNkvXXu0mjf^6bW4 literal 2000 zcmbVNc~H~W77m*rVqjE61QoU7fn?w^Jd!qaliS_nLB6ZeD|F1W_o(K ztykZw4uL?{yMN#3V4)<7sTOhe>eo98t(4m==~jak`|IphikcR%(AGj#sz;=@wM(MC}muiExY;E zR%m29A4!Vbpud3qh&S=h9SfNtt9=l&cGWNApXXcG!0P{#l61ycXxXFU2xzT>eWx~c z&ZqNQbjsL)DRf_$oGlR!HcsIg{@PTLy11qGv0>$N<|WZf4Tj#W0J30Kx`3VTq1x16Bv)nVqGPS z1MK$VZ=w0SN3$Y&IJ^XY!3@GvN15RGXK>+jId$Jyw)CQ~Pp2z4es`#B-Iz39sxhK2 zaavfKXA{(?l?fp~mS+^f)Fi3@65wgD^V^`QL7cQN1z-Y`c; z4>jqe`Ql8#1WjQ1!(_u#Vh3W#c-z5}tPde)t4&zgc|&gMtC2y`0i!u*Yz=<&c#{SB z=i|URC*iWc?#VX*J}vB!}m4nkii$)pst2QaA|uwbSFy37+;Fq@&C)dJcc~ zjiC@y+XYRb=Q;h$%rOvB^Awfa^A^z(?_9m?&Q#3bSwt) zG$taQ)e5*#05*d0uy|L69!HoxUv$Z>2A-9zwRvQ^<^(`QFXzE@(;L^Q<{Ui?HB?v} zq{DO<9lnkEcti_9Mo^5dhiy{s=o=w?>e7^PiQ2$@K!PCTT{K{oR}I4Sj-|$+#adxM zuGLf9MawzP_iG-xFmN5Tws~86@mFQW;9TETvZ_-_1P~DP)tyt(`>RH^C}DkHsvIsd-AixjA+^2`nXsJ#W_y9E`F$o&)45-1oQi|Nl{(FkusHA_)v{f{#F&Lf8T7Fc#Aty_u#r53Nc z^LCsaVjRYG9QDB~)Dam{3y~AaW{*`Cs2{}*Oeg?>spyB?%iUuCzDGBywm3L`(#-r* z`GXkrw-P1?c|Lo9m>O>?g5(d>(0Z!2igC> z%}YA%mScZk-XkACv$>N5D@=*sxd zy?5y1dI46<7r(BI5ac@&Vrb7acJ!n>{BE;9fClyL11yn_o+LLujDxd}Q8ny+MtEey ze$pMulHP7k*7HH#=O~%qurD$?LEe7G?0r;IQn@Hms7~Y4^-U`l$H&Q!;z-V5#m`` zscWQ5oq;dyP?&)qCj#ACucq0L`&XNz0gz=ye^D7^7|70K3U%2#`E)U+C3 zN?rZUzyt-LwpBjlcQ;vNC0%&mk9}#xJ*b&^Eq_|Ew}WBqL^rybd$qc2zI9L-0OWcz znG=};utXZkMv|Iy)9zVy6NUHcqH5nKoH$+U5A0dLzl{YXAcu*F9fjS*yn>VV=P;Cg zOlr?!MZ~evh;H+IF#Q6z*(OQ9*2T)R%hTKTR8(z#LAA*LxvWr9Wj{1(^NZKge8yAN uRj(gSsowd;zwCS;$8xqC1;GQZuPD@14v_iYK`rv{7vhfaZ~>iyQ~wJzu){0> diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html index 90df95364..2580789bc 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

      moMoveSelect< M > Member List

      This is the complete list of members for moMoveSelect< M >, including all inherited members.

      - - - - -
      Fitness typedefmoMoveSelect< M >
      functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
      init(const Fitness &__fit)=0moMoveSelect< M > [pure virtual]
      operator()(M &, M::EOType::Fitness &)=0eoBF< M &, M::EOType::Fitness &, void > [pure virtual]
      update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual]
      ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
      ~eoFunctorBase()eoFunctorBase [virtual]

      Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
      Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
      diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_select.html b/trunk/paradiseo-mo/doc/html/classmo_move_select.html index a3267f9d4..47208c1b6 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_select.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMoveSelect< M > Class Template Reference +ParadisEO-MOMovingObjects: moMoveSelect< M > Class Template Reference @@ -8,6 +8,7 @@
      -

      moMoveSelect< M > Class Template Reference

      Class that describes a move selector (moMove). +

      moMoveSelect< M > Class Template Reference

      Class that describes a move selector (moMove). More...

      #include <moMoveSelect.h> @@ -38,11 +39,9 @@

      Inheritance diagram for moMoveSelect< M >:

      -eoBF< M &, M::EOType::Fitness &, void > -eoFunctorBase -moBestImprSelect< M > -moFirstImprSelect< M > -moRandImprSelect< M > +moBestImprSelect< M > +moFirstImprSelect< M > +moRandImprSelect< M > List of all members. @@ -146,7 +145,7 @@ Implemented in moMoveSelect.h -
      Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
      Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
      diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_select.png b/trunk/paradiseo-mo/doc/html/classmo_move_select.png index 10bda515a7357fea269e9504ccda8891cc87c296..0781eef978a681677ee59b2cefa2fa33f49bd163 100644 GIT binary patch delta 953 zcmV;q14jJb4%`PJiBL{Q4GJ0x0000DNk~Le0005m0000`1Oos70H>i6m60Jce*j@uv*#cfsEzs=kLdVy6d^*l(Ga{nWg8D{M9N3txz#;$qY^*VTXem}q@ zP1hAxZ_253w({yvX|A=2mDg zKDXl%M$VpT*UxPi2jjxet!%|~LRN-XHe#XOvO2GB{#oi2R(q+@f7Z9!OO3X^ z)n00}^{w{Oy}n^hldm1%Q2E*cj?~Aac7h{yFWSe$*N$+Y?nQgAU8>Rk$MUrU94cQs zz@hTB0~{(}JHVmxwF4X~Upv5|^0foJ(#PZMDoR_@4CM>^6%E*E-;yuv*J#gShVq5| z8tpmEP`)o9<+oYop6r(ks%w}aG4k!o{Wv?g?fY{M0; z%7=Z_t-~eIMsm&Swk7R!uUR;0Uxo|!wl8Vb#SFtWt#+K#LiAYCe*&3~0nyB2PivxE z7$ghUgr*SChH`7kBechh#u@m67Q4m{=onsQ8IH8ed=To;kJ|AC0QRB^i`T%K7qnog zpQR~48~ibrVqyUUF0J}JYc(_J79OJ05K&Ki{tBL z44GESjB#8F!fa`Ee;6IkS?(?2IGvhXt~E4&kZCy4s(j8(MAA+cplIV5E86J4pmj_P z%W$zh9vm&l*eDN=*{0={oN2hG#jez2O&iCS502J%B;ySO@32AZ#)dJRwDYJDjc(Kf>2Eb!{lTd3@t63%VWsy#W=a85hz$v_>)0W|df!$!O(%LI%Mj+YiJd(nPN7yDnq+h&b6Uyb%H-HkTstI0Hd;~UmArGLYk brq6%As5t(r4}fw@00000NkvXXu0mjfqa@~h literal 1886 zcmcIlc~BBq97gjBLd^xm3y&Rks zExe*c%{0wwbOCP-vJ}g*WAhF}VcB-J-Ddh@|7d5v_rC9&_nY_L%=>=x&SSiGgMnH= z0002q4S0IY#Xb-Uae=^XXOUO`GQ%-#bii9{lm5=nb$X;8jYeID)Y?a3XI7g8$| z>+R(OKu(RG000yg_P9A8NWAv`8a77YsEV59iqO2XJGKYe4j!yE5e0Vmc%JgK%^yX! z@}bWQ*U3yAGEObn=&c!G0T+T4R_C`1Y+aYr#ml<)5l`FyM)VG%YR3%1oKb+i`)C$1 zym7y0c=N6ztj+`yvYDK@!XwjXEa_F|2B&@`X`vjbI-Q6k<4A~~#6LR6u##6kan8!* zO=s-!l&wV0EW$-o^O8rd;hiSKMh;1UQg$o2;gm;=gDlF@CpR!Ei7m$CMkjGRQYU! zFqwYgD^LVdOIj8fNbuE%q9+ucL8`93vJX_5082S@(+m$T8;J-fV_Jmo5B~H8XW6mb?vphRa?$L2?2z5B~ow~gEP`urNoG|94>BFsIxhZMlm7pi{ardNb}I%y$=ygV{~8BlM9uB z)DB0YZ(|nLZ0NcjcJRX$T<9qJKDK^p+P}}1=@nnyn7IfvK~uDBu?tOxxo?khpj=H~ zjKMn7KKh)2Me*P#o`@K7n)yETG8^Bc{<0I;&B0`@#bNe8S&S4d$9J#3ndfQ3P@y;o z_r~gY?z1v$X_AuL(*0J|CZRA?R-1C{8d~%}kO-$n^uuI=mHhBFtfp#hScdjrr1!r( z^}j;20+)p?a6e?5-Vv?kx0*^1{sLvUGh;eCGv>myN~6dLxGUILY4kNp1`>t0)#ogT z;SRBSr1D!Eh;O%Pn33^XsCzWMmpOSPe|Act-hPHy+A8sG>ooKreBc8Nrsp4$pEk0-nAKd6w7sy79p`yAA|27eE$@2NGb^n9#QnN&!= zahYCyq|c(IAqa9EM`I116eZPDcAA(0^N7cE&IdPHomBG45v0|y1}p4wI>$pHccM)a zJo;*1rgqg48bS(D_0nx8S|aSW0>6P7a#R|apst@um3L34P@4Y?{$~<8|A%J7gYLPz z_F~)RA237eJC0KKv@w@ee?+~V6idcA`^_u z#&KDTU&mc!Eyl}%7Div0c;Gozeyh!+GN+-X<7Aqy4KsC1T^n$-r%|0-JPe-FADjR= z<1p4N8BQDdS?p;4vvIUOan{1!knPIVyDhXNR@HXuG%ghqN^D+iipzE`9TLYRCtFoU z-;@L#M2ubZT2N$@0cz>4W{bTgG5l9%X(U4@YS@gF~z10??UPjX)JCVJfYXxeLWv;sm94*&Q6c?(j&o zJ4t!|Y0s)d&KUNA`tH%CKt7-C|L{~?g!MbJtYSIh<04^M;#o2AvZUoFSXZ)oR(W>o z(do9^jTEtWop_g{$&|W0GB`SHk(DFZmy?cNP#Xjt*Wrz5JodfC{S8V%sH&;ZluDVS z(2N?`g5UrS69OOMVuqs(@_G~wn;w$vYS>P^M<7VA>_@J;sL~TI_(47DE?+!NzeBcr z{<=9|NRp=s@p8224Kiebwf*wGYoN6(e2xh#9}i+x5xzF(6C^KQ1b9FZ1gl65=8g|ph-P> diff --git a/trunk/paradiseo-mo/doc/html/classmo_next_move.html b/trunk/paradiseo-mo/doc/html/classmo_next_move.html index d2491174b..a742b2eb5 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_next_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_next_move.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moNextMove< M > Class Template Reference +ParadisEO-MOMovingObjects: moNextMove< M > Class Template Reference @@ -8,6 +8,7 @@
      -

      moNextMove< M > Class Template Reference

      Class which allows to generate a new move (moMove). +

      moNextMove< M > Class Template Reference

      Class which allows to generate a new move (moMove). More...

      #include <moNextMove.h> @@ -38,11 +39,9 @@

      Inheritance diagram for moNextMove< M >:

      -eoBF< M &, const M::EOType &, bool > -eoFunctorBase -moItRandNextMove< M > +moItRandNextMove< M > -List of all members.
      +

      Detailed Description

      @@ -57,7 +56,7 @@ Useful for the explorer (for 22 of file moNextMove.h.
      The documentation for this class was generated from the following file: -
      Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
      Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
      diff --git a/trunk/paradiseo-mo/doc/html/classmo_next_move.png b/trunk/paradiseo-mo/doc/html/classmo_next_move.png index f0527341dc80bb1e925f3d8355dfe85aabed29c4..ee1f90bbc464ccc6979fc685054b6842e06e6e3f 100644 GIT binary patch delta 479 zcmV<50U-XG2!;e9iBL{Q4GJ0x0000DNk~Le0001+0000`1Oos70Q_JY$dMs4e*v6H zL_t(|ob8oMZp0uAhG8>n>>I!dMy=HIbd~!bq4@tpLS7@0W`QCM^!czQ-@)bBU{Qv{)sB4Q zT`{;BLo2b@+4%}%$%GRek}9|zfA0ckWs4Ap76jOG?SUoIdf>glEqaABXW8J|vh#t} zu$RPnSM?67p?8jd3-e@y_+_M7T_-!^cJdd0WCQmfaGgJlZSv?@LwDTtd1KsTnr@7{ z`D6!f;0A8s25#U6?kBkSCi!S{d%CyOQ3kFPE+&m48$HvsHwF=4MM?;M5{5HDni&mg1yT@hI}WG^80rE3pL! zcgCQ1YgFVl>In`>6&!g7TtZ=06y6Z|lx~)@h)U_V#-;2dZs9CAj&+N(RAhs@$gaX! zl2KWWvS{EiuhKiLWA8AsH8NRFbl!KEtWB$oG^^`mXWYrY`@Ia@z%}C9zIcuD`~o{D V6NxTB8G!%*002ovPDHLkV1l;T;0pi% delta 1015 zcmV0002M1Oos704^vvNRc5ke*>^d zL_t(|obB9eZlf>|0ATpDznQtgaDr<0LXlSL{g1HB%Z~sl6tgs9tW*gW@L_wJrcCVa z&t>JK`#oM&!Vddo0f1tQQZ4=myEZ7*(tOu;HcjoFT8APb5poS6S0l15JIFrGZ3ZX7 zZ6vMXs{v`ZZqoK1*lmNf-7iCJf3)$QYR6OT>GWm0Yg_xAdw{A~Y-FRhY2B7sz#TF7 zz40b{iBI-f<6Xo#p%7CIX`IV=6VO?4-oAt#cGzdzSAIr5R366;e^>k0=RNJu&&Mt8 zyT*CgVTT=d*kOkqcGzKu-PXSHfB(DQZwdQKo6`-HGF@apBQ4$#$Kr?dfA%@wMt{D0 z4#n>IybE@fa$r)9Tuwuvo>(r7w1UQ2&VU?Ux8<_Gv~4fWj7hqnvdQ_JJgaOdl+sSg z4|n)DB7Tgy&wVe=ib#J?o4WO6TOMW1eGX$zvG^$~8!W}7m+Uqc0gw|m$sTpQE8DY1 zc82mm%UetuLK%f_kAUfg#;IHlxJ?o$`upvz z&v6cZ5o>Y&b=i~Mp5?;Vl64#H9a;U^JIv~Jw|_s!&As$f{+5J&e+T=@&&XH)Z}6^m zSm4x3#%$ zZ^HN4Q_K0SQ0%@pf0V}otf!^6+lcSB2j4F3&WAbK?c3dPpiQ0HYv1cYbM&Y2wiC7; zZ;taW#d$yE0G}Qy&WBAW++m+p!VWv^v+XNCBOfY{CLQp0cI3zIW#2WF_pq6xy+7Pf2{qMUCkLm!ov26Ty(!!z zFWXIN=2BWeu`p$#(%jbOy8Q~@XruOTCiHT|CfkjB1HgLPr+2-=H`{ssmf5 -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

      moNoAspirCrit< M > Member List

      This is the complete list of members for moNoAspirCrit< M >, including all inherited members.

      - - - - -
      functor_category()eoBF< const M &, const M::EOType::Fitness &, bool > [static]
      init()moNoAspirCrit< M > [inline, private, virtual]
      operator()(const M &__move, const typename M::EOType::Fitness &__sol)moNoAspirCrit< M > [inline, private]
      moAspirCrit::operator()(const M &, const M::EOType::Fitness &)=0eoBF< const M &, const M::EOType::Fitness &, bool > [pure virtual]
      ~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual]
      ~eoFunctorBase()eoFunctorBase [virtual]

      Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
      Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
      diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html index 4040f2fe9..9d4da6dc2 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moNoAspirCrit< M > Class Template Reference +ParadisEO-MOMovingObjects: moNoAspirCrit< M > Class Template Reference @@ -8,6 +8,7 @@
      • Main Page
        • +
      • Namespaces
      • Classes
      • Files
      • @@ -38,9 +39,7 @@

        Inheritance diagram for moNoAspirCrit< M >:

        -moAspirCrit< M > -eoBF< const M &, const M::EOType::Fitness &, bool > -eoFunctorBase +moAspirCrit< M > List of all members. @@ -135,7 +134,7 @@ Definition at line 4

        The documentation for this class was generated from the following file:         -
        Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
        Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
        diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.png b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.png index 2faca5ab90b299f2807d78674afb81f03d1364ab..f8412d8ed8acf7254dedb1e46f342db73d89bb3f 100644 GIT binary patch delta 439 zcmV;o0Z9Jl3El%CiBL{Q4GJ0x0000DNk~Le0001i0000`1Oos70L<(Q>5(Bbe*tt! zL_t(|obA+0j>8}f08qS{wapEj6O3jq)K%_(gfaevGz29Q8Z`@?Dp2aaItDfU4#s!- zS;k@tT_MMW^+s8zxvuer!0!p!zYv0qbS`lD8731XFOz(gjgx`tTF6ukzgW`b#@U3d zPeJxWs&a0HCGUjA81`OhA86SLf0bwjlGbr<1&TDQYa<$gwb$IOA%uPn>{IK5?S%=} z2UmN2V6p+KsUnb{@(k_9E(P&%-fp9oNST hw_*w*4FB8z0hBcKd(9`$4WDXk5=ylKlMGu@f+~a`^~I$LJ(BqCKFzb^{`806e`o)g zdN0<#S#VLp5spI|E_ZC6Mpf;5sl)U5m*(}LeQT>7)Fq$);1qS6neVeRMeoGXAc@am zD~lzQ8NJ{1Ofh$TuQL5tu$^dNJ&$r=_v)T${X4%z9g|$#`M7OkkLlBmapzZx8!!7Z zW8Rwkc4(YDi~{+0HT zumGue!&%u4^%aMA+)!GxYF6Bq31#v5PudD{o|k$#5Mvl@IS>b(LK0 zyIe+ODevM9visOiM8!x# zLoRRcd_NiYZFyT@#?1?y5yxiDHT37Sw!fAU}j{#y36>3ep4<%Pe&uihFT-K`~I_^SEiEAGqcE&CJxFS{Rn;A&&} zGWKI~dyH)j$_&$Ck%SaqsLVt6KQDXr`1gkdmlwMYuCaQ@-dw)5T=nm5rMG zWIp*J^o`T)|3T#3j;fX9+O4|nKdo}@bN8(WBTXxtKQDecDxUf57AY`ou%>W)aB- zPC$iolVwiFU%Mi5w%lZEZol)|@-@?gdnSLiT_?DwV%1ePtBa= - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
        • -
      +
    +
    +
+

moNoFitImprSolContinue< EOT > Member List

This is the complete list of members for moNoFitImprSolContinue< EOT >, including all inherited members.

@@ -37,8 +40,8 @@ -
countermoNoFitImprSolContinue< EOT > [private]
firstFitnessSavedmoNoFitImprSolContinue< EOT > [private]
maxNumberOfIterationsWithoutImprovementmoNoFitImprSolContinue< EOT > [private]
moNoFitImprSolContinue(unsigned int __maxNumberOfIterationWithoutImprovement)moNoFitImprSolContinue< EOT > [inline]
operator()(const EOT &__sol)moNoFitImprSolContinue< EOT > [inline]

Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.4.7
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html index 056195951..162db3081 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moNoFitImprSolContinue< EOT > Class Template Reference + +ParadisEO-MOMovingObjects: moNoFitImprSolContinue< EOT > Class Template Reference - +
+ +
+ +

moNoFitImprSolContinue< EOT > Class Template Reference

One possible stop criterion for a solution-based heuristic. More...

@@ -142,7 +145,7 @@ Indicates if the fitness has not been improved since a given number of iteration __sol the current solution. -

Returns:
true or false.
+
Returns:
true or false.

Definition at line 43 of file moNoFitImprSolContinue.h. @@ -181,8 +184,8 @@ References moNoFitImprSolContinue.h -

Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.4.7
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png index dfd768a2f9c12a2074763981733d8f24ac4c6316..2c63d62af9e1fa553cd796eac9cfa94de4a8379e 100644 GIT binary patch delta 30 kcmX@ka-3yC6jQ~VjWM?w1#W2M-DUs+Pgg&ebxsLQ0I~!M%K!iX delta 30 kcmX@ka-3yC6jMa&#+ciT0!!yke8m6+p00i_>zopr0JDM%2mk;8 diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html index 29b47e0db..3513f975d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

moRandImprSelect< M > Member List

This is the complete list of members for moRandImprSelect< M >, including all inherited members.

- - + - - -
Fitness typedefmoRandImprSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
init(const Fitness &__fit)moRandImprSelect< M > [inline, virtual]
init_fitmoRandImprSelect< M > [private]
operator()(M &__move, Fitness &__fit)moRandImprSelect< M > [inline, virtual]
operator()(M &__move, Fitness &__fit)moRandImprSelect< M > [inline]
update(const M &__move, const Fitness &__fit)moRandImprSelect< M > [inline, virtual]
vect_better_fitmoRandImprSelect< M > [private]
vect_better_movesmoRandImprSelect< M > [private]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html index 26fe7037e..f4b78eb20 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moRandImprSelect< M > Class Template Reference +ParadisEO-MOMovingObjects: moRandImprSelect< M > Class Template Reference @@ -8,6 +8,7 @@
@@ -210,17 +209,15 @@ One the saved move is randomly chosen.

-

-Implements eoBF< M &, M::EOType::Fitness &, void >.

Definition at line 77 of file moRandImprSelect.h.

-References eoRng::random(), moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. +References moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves.

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.png b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.png index b935a8e2fa9abdb9411bab10b463c3c2bc1e48d9..6931c3dfdef9b2f9d4a0dc4a28e161ef38b999c7 100644 GIT binary patch delta 478 zcmV<40U`dh2!#Y8iBL{Q4GJ0x0000DNk~Le0001&0000`1Oos70Onl!Mv);ie*v3G zL_t(|ob8oMa>F1DhGCPner|wI&}lE!RqlU;>VX^)lQe0WX*z=(0|MzoLS&pi=E+-n z-=@ie&4AVR?gD66!n*5a>tq093-s_Zg27D3uv*!^qQPV!56l^b7oqDYkH889R~TAt zuxY1WGHiNnkW%E=Wf5RvH-c@5e=r$a+6@+H0~p&Fg>9ipmC8l1MvlXhE4pPz`vz95 z0Cn>wMCP#jk$HYv$6~O-nb{fKIWsS!3}k( zKY*P-UlevapI;RA!qr@`1zWHMTd)ONFcr)bN;EJ21^Xo|13~Gw$sn8DfBll{``i^Q z1+9mX`5a)}BN(xo#WBNRa$9&EJg4)b5Rpd57FpIP<2H<-ZUSR-UM6c~9kthO3&=#;PbX&fN2IPz>L(^b07*qoM6N<$f)kX`k^lez delta 1041 zcmZo=*}|dN8Q|y6%O%Cdz`(%k>ERN@z`zJ(G8|xG29lD87lck!G_Gep<>}%WQZeW4 z?C7$`3OsFZr&qe&YMdc^CTE5J-Ty*toSe*Melqc1#-h1*BiOz~ay)us?^Dk{{iVN5 zRGoDLvkU`6!>gVy(fwQtN?ne6y6F6=%ok(+Go4^(HT#n(}tUD46 zLE8+3JXk(y?iK1*W>5$;n8s7zFpK%5)O%(RyH^}r7%Dj|#IC5koXRlc{X4^kC+z#C z^t2Z@d{Hf9*#6AHl$+zI|E7R>tdp2oN?z;iSZvY2Y;nMxLE>LT-L{%J?;f6ItgHQ3 z(s2HKzdWCT4X5k@Mj2Fej+y6wQ__!c6TSxw+zj5jAy4esWF)X8Yx|8ygg7 z1gw@XXidswklNWA?fE|~nkQ;|xWLyM-VFz@Fm~MdD8!)E{KCvtWukUNmco^4ecKhs z4pn(G2V9X~eX6eGhk2N@0^1T%h80s%vVwA7ux&iywIVKxA>br$5^n>q!nR3sYemv-f(EViFH!Kxzl9Mf~R<_q~e$RS#Q`M51 z)#l3VKUOjvmOtHIZ%|p@@Nm=J0x046f&my{sA$*2pX)P#!5eow^JXlXAbT_<9c+Gf&HOxq|tn0B{({%=q_zm1AF3o!5IK??^ebUnRZxt>01bnw|IV{A; zyu*%3_1m(Wm(uuVJgUg#i}-Y!yRdZ=U&!VILHjlOs!vs~Z2>v8fd9aUvUpm;RIS^r48fu6 zbA>m}7j^g*?sZ(w(vmVVZhft{^MPEB&g z9iuasi<|B;h}{=;I8pl|v9p0OMzoQOL4-l8p_K2$c~i>`XPOTDTj0WwBIL9py>aP2 uMjP$)utVP00@y32gQ9OeqnrJ-|IBi8Rex;Ke{~O(**#tTT-G@yGywqTdac<2 diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_move.html b/trunk/paradiseo-mo/doc/html/classmo_rand_move.html index cce34df23..345a4e8ba 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_move.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moRandMove< M > Class Template Reference +ParadisEO-MOMovingObjects: moRandMove< M > Class Template Reference @@ -8,6 +8,7 @@
-

moRandMove< M > Class Template Reference

Random move generator. +

moRandMove< M > Class Template Reference

Random move generator. More...

#include <moRandMove.h>

-

Inheritance diagram for moRandMove< M >: -

- -eoUF< M &, void > -eoFunctorBase - -List of all members. +

Detailed Description

@@ -56,7 +51,7 @@ Only a description... An object that herits from this class needs to be designed

Definition at line 21 of file moRandMove.h.

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html b/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html index ccf4cade6..8d540a37c 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

moSA< M > Member List

This is the complete list of members for moSA< M >, including all inherited members.

- - - - - - - - - - - -
className() consteoMonOp< M::EOType > [virtual]
contmoSA< M > [private]
cool_schedmoSA< M > [private]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoSA< M > [private]
Fitness typedefmoSA< M > [private]
full_evalmoSA< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< EOType >
incr_evalmoSA< M > [private]
init_tempmoSA< M > [private]
moSA(moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval)moSA< M > [inline]
move_randmoSA< M > [private]
operator()(EOT &__sol)moSA< M > [inline, virtual]
OpType enum nameeoOp< EOType >
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< M::EOType &, bool > [virtual]

Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  + operator()(EOT &__sol)moSA< M > [inline] +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_s_a.html b/trunk/paradiseo-mo/doc/html/classmo_s_a.html index 54f948215..6d53f6ea6 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_s_a.html +++ b/trunk/paradiseo-mo/doc/html/classmo_s_a.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moSA< M > Class Template Reference +ParadisEO-MOMovingObjects: moSA< M > Class Template Reference @@ -8,6 +8,7 @@
- eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -182,7 +179,7 @@ template<class M> EOT &  __sol  )  - [inline, virtual] + [inline] @@ -199,17 +196,15 @@ As a moTS or
Returns:
TRUE.
-

-Implements eoUF< M::EOType &, bool >.

Definition at line 80 of file moSA.h.

-References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, moSA< M >::move_rand, and eoRng::uniform(). +References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, and moSA< M >::move_rand.

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_s_a.png b/trunk/paradiseo-mo/doc/html/classmo_s_a.png index e14866c803c7c4f0523a036fb3d13d1120177e24..59c20157af06fab2bc77bf29f8e564f00a1a2deb 100644 GIT binary patch delta 422 zcmV;X0a^a>3(f-}iBL{Q4GJ0x0000DNk~Le0001u0000`1Oos70M^j!XOST@e*t7k zL_t(|obA68xr&37^Il*A??$A z`4Me8T@Hq0)kwb{0OZG0I5}~MDu=tEGk9uDw03wn@wDp?Kbfz<%=}hN&4h(6|e7GSgPv;E> zAVlO)vmboqSh;O&R{2Vo!$WyI7^|JzjsqKRKne)sos%PY7ailGBSYjrrjeW`bnHk@ z;Ph!+c-|f8$dNi*>1sa7>CGoQS|1JWs}HZ2?4Ri5&|CYbr%mU-I)mOjKT0+On3w54 QUjP6A07*qoM6N<$g4-v)+W-In literal 1521 zcmcIkeKgYx7@m9$jf+UiF41*Ek!#G)XYjG;_iU81`rVaazN7^i3lU0N3Nk*RCK zRn2^*D589fX~~pk*=P=C?8ff8=bn4cJ?Gv(?>X=DywCgm_nh~ z*SX1P5J-`LbUz$;v3!vn+RV1vp4*=^=NKt;{j3Bm=6-p$RXV&*(u*uA^KMRC)re80 zzxXk`YIx}e{hgIa8A%;}#8L8a$-z={B%A>A+6#?_mg8=i(j;OjqGKM+d@y%$h`M%N z-<7e?o6(DPz;#{bL>uA=ZO!{|kdyfi>fA(waD=(wSLOiE!N9e0qKU?;jkeXMmhgS8JSj_Jv)=*1P7tP3d+>bdsE}{`Gt;Gwpz)sItuirq10siMlYMl@s2W~qx&Yan9k>Zz^^<=cJJ>*mW0R@I{_3{HDl@dR7cv54q z=^YIjW>~MF)tB85S)}Gogoe49 zEsWs}{6aX5kDx^o{J?rE^uz6CTLfJ1#U>ErDE{W=((5&%wXmR9IgG($gI_;w?fX>Y z+&Qs|KE@(Vz#bQ4BhhY&kAd|p@%(&CHzG`NCx5S%8H}B^HF7Sr{AR~*A`gn9m)iAR zd&b*yb<xD~A?s$-5E)mF$Ev1|ZNDb&;k-`=(G z#-=EkY`sm(-z&|>6*E1?C2J8ie)7vWtzc4x3N|_0Qxa}ANopUm9PSH}lxPz3v8Mcm zmgW0{NMl1y{PGvMvKanx>{Ktk%D&!f zerLLw>n6MGx9DTV%H*=F8)SWc zKB=6;U`M>z=`NA|XAsf@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@
-
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png index b291321faaf17e8c6100bc5ee1e17a61b49db06a..e9805858786b40090f946599b365ea6264824945 100644 GIT binary patch delta 500 zcmV6hS08negTJjB)6EN+Cy5jyvs6MtMCuEoaX@Rk!QB0f{S#}xH_fhSf zzNUlPpkIY1qAY>Ery+FhJl{(fg=1%qB&WM+W=V(16bUSXygX}~C_h4HQamfIX68n- zMI&?8w>@G9J>^Cl7isBuvX$Pje{a)F9X)w{{E=Li@v42B&VANCiQLimW?gH|>ss6E zo?5pZ!dd~&nTfn0Wm{BwqkZB(`k)7WP6z&2*waqCM!yPu`FTV7bh*4C{iZu)(1RZI zpa(tZK@a+wG#%A2;V~0TY0&>g6D0_j${~yZS@|@7BmqJf%HI_lI>t@~e}Zma7>;dp zrO|GPG=Lm|%2N?RKG6%ZHJ!FSYC(rI9_?oIN9kqoX=$Kx z)l#vjBxp{l&J)9B8{p@Vw&^tY{NChA&9vJKy10cVO|JCxHeEur#f~&seNroCwL2OX zv^^@&K22C;ZIL>9opqp_O1~&_tTnA_?L$_z)@7zv>$*dhTf+lt1!U>v>&*&McSxbH q?CWlaKiocwenuPgU((0@Soj6?Tt!_|T9m>70000z$e7@|Ns9$=Kuc(=Fd-< z0AzvjfddDs5B+}vR<;VfU8 z*%kkr|ApL4>~~G_6}r7i|Fh`wNhc0*^hNasmEAtQpLye-&3uRN2QNE3<>kjcJsk() za@IB~7SA!+cCF&}*IuK-?h|GI4ld&}Y`dbQXxcs@Wli(f%Kbh@H2`vPkCuLgXi~C&P_4RaVFBCoQOxaptoW z{x)Z&yp_e8Wdh&kbed-FvJ4jQ<5;(2*O50Bj59TUH}8>pW7Mi8oV5G=mLFTLs$5;Q zeb&5(ja*eW-{0LmGjD3;lf|s&+xOk;ta(r${3q>~^5K7rml&s3@u(fHt89w-{OEOm zjcX;R^VCW0lO$J7v6*rvfYT;*7g=$H9;;Pn4c?e{OxSqOZMM<(nMStrrmXz>Drf=6 z>$uNR3-|n$oN1MRU~a5h3D-yQ(-FKuMXZ|Bx7?nd@BQ_6vr*8#hgECBpXW2(zIJN% zQa9=P@U*I^Wwl4QPy6>V`{dRsw@%&WzqLmxc=f}#Mv<{4tzDm*&Gb(k2~Nq;W}kW9 zb=lLNJ5PKx^Xrw;zg-ns6DNDx{B88dy;pC^Kk?teyuV%Za`LG!GmLE0Vt?NS`c(qr z^QBLyoMb09M*J~-Uc#Dpssw0Ro#tlMUD?+A{xv$sMsZh9jxVZ@Pmg@?Lp=3PVp8=E z-?x12RX=W5g-hnM?@@bv>9XIcnU(LiiS0M-)Hj;+EobsE&+3(%PfskocXFyxT+BS( zuOi!D<~ZG3_Bm3|_HEINOKzt&n{CQfoj;}cwB@w^Q%@LkPyD%|TRSuL{^!(``OHD7 zbsK)J^)b{mdU@>askm7hs_VC#xJ#youkCq!_tWCD?^Eu09(&@T_VsJGwd=8MMH6-^ z87W-u@jKaMscddJd3VeN<4jMF(=&I?I(J$lzh;+S^rh~K-9DwJqBG?yzVQ9&R-B)H s>I?h-|9=<%;Q^Ko2}W -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@
-
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png index df07eba57fabdbeea50b82bb1a8169547b89e02e..f08f987a9e06e8964a9c825a89e4f51664754d17 100644 GIT binary patch delta 514 zcmV+d0{#8q3aJDkiBL{Q4GJ0x0000DNk~Le0002M0000`1Oos70KJrFcab48e*wQq zL_t(|ob8rNa>FnPhNVr{{JMeM8?+b7D)&D^c?elj;+ecWbuuD}u`uQXfin)jJ4^Uk zc9ri5I6fc)5S?tvDmTkqeop{AR%#b3fHfWjq{OKqX)IO=oNBfTa>{rffGmhC08v;{ z1tirHIA{49=r3^e>-5Ca2tU8+yb)h*ka&hP2M8h1js`Ls?h>K_lp;fXE2GOE~JO zG3+2FSXp9ldngwzFy}#JAP1BPVv9A99)c&i0?7BxR|QbgSpiBI03}KRz&)-3xcx04 z*p3<4JBtAj2S91^bpZ7hSXe>S0WKo1M?kY%+c>z$e7@|Ns9$=Kuc(=Fd-< z0AzvjfddDs5B+}v-{<+(;SAp{ z^C|IL|EuzN+3rYqvd!>WmQ~53RU1N`tW-2*%4R(*cjnpuEbYhk(;+X6OwXO};IR3; z^r~UXw#mOPy^`Nu7kErxFtYFd%`4}s#iNe2raf=!DcxXqe>x}I=_!%Ne%=uJazsgZ z{;%)JC2?*#RyVaz?U-Wh{ko?AjFG%snzpciaL2^^DnGWT#Mr#r)$??+^~4kM&wBj% z@A^I4HmC9GleuSiZuzlemQMPfAGgCUe+N2Ymrt)=@M1&BZ?}b0cChWunByI=jp4(2 z{@V;0UeBJp-{jKvJ!vxaKpX}5 zHE?9UPTrzd>@$63qtU_%&$U}K+4p}=+~i6C-3gf{TBO~r&LmV{@c``6V!Ry+8%Y2>NvxI5G6N`0w z1COo0Z`$xUBK6q}@h~r93yE^h6h{ z)xS*GJZnyL@v-MiRzCBIvryXc=#$XqzpN>H*6=^d+Hm>Frk>AFt%4r~hfPjdeJjiA zu(W8&{`axFXUv^i`Fu4i|MY#g8t;6#^<=)!{-rm?y{uxFxg{ID*{*)VG=JZ}Q{_{p zUkK6MsX23**GXE&SYeRb_0_?Rht6i7&2Ibj&DN+guH8ROGFT|ecsJoS|BzMWtCx2rx6%F@i=pZU4dXIOk~Tt0E*+MJYk-99HJD^JV}xwlU_{o2(hYvSHsp8IX-kGQP2`Jc>V z8uvR-UwJV#t7N9s-gSR-r|2@6gnH$9En68>6l~qDDlmfevu|8Pa_f8sjvlw)TVg8vvd@qD{;>Ot7F z_UEa`KI}JiORco%^*+7D1Wj9pJ@-w!^1^4vu7{w|Xcb-i<%wwcyb(-hk zNw=*(AI-m@Vi>bfaXbIZ`GHA=^Ok9px~ZKN`zC*S$+z?q?E6po{Jirt-BWGldL#dw zxJjPIYLXMT+@E-6(k%_+Bb&ukKgWd52D)VK83ExR5ox#F)Y!6aov0C!oDi9=C&zBI zvv#_%<|+9nXEs?qDm`}W?CQ)ZTh8gMzRcvkJd&8bovp4jSt)h?RnvaR?IusCG!boFyt=akR{019P^00000 diff --git a/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html index 3e6ee3c2e..94e657cbc 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

moSolContinue< EOT > Member List

This is the complete list of members for moSolContinue< EOT >, including all inherited members.

- - - - -
functor_category()eoUF< const EOT &, bool > [static]
init()=0moSolContinue< EOT > [pure virtual]
operator()(const EOT &)=0eoUF< const EOT &, bool > [pure virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html index 8381967c5..6157338a1 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moSolContinue< EOT > Class Template Reference +ParadisEO-MOMovingObjects: moSolContinue< EOT > Class Template Reference @@ -8,6 +8,7 @@
-

moSolContinue< EOT > Class Template Reference

Class that describes a stop criterion for a solution-based heuristic. +

moSolContinue< EOT > Class Template Reference

Class that describes a stop criterion for a solution-based heuristic. More...

#include <moSolContinue.h> @@ -38,9 +39,10 @@

Inheritance diagram for moSolContinue< EOT >:

-eoUF< const EOT &, bool > -eoFunctorBase -moGenSolContinue< EOT > +moFitSolContinue< EOT > +moGenSolContinue< EOT > +moNoFitImprSolContinue< EOT > +moSteadyFitSolContinue< EOT > List of all members. @@ -55,7 +57,7 @@ Class that describes a stop criterion for a solution-based heuristic.

-It allows to add an initialisation procedure to an object that is a unary function (eoUF). +It allows to add an initialisation procedure to an object that is a unary function (eoUF).

@@ -82,12 +84,12 @@ Procedure which initialises all that the stop criterion needs.

Generally, it allocates some data structures or initialises some counters.

-Implemented in moGenSolContinue< EOT >. +Implemented in moFitSolContinue< EOT >, moGenSolContinue< EOT >, moNoFitImprSolContinue< EOT >, and moSteadyFitSolContinue< EOT >.

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.png index 345d1b66d6bf7bd456e48737ef14bf095b031c61..c6ccfa6a69983c3f5670bc31a8b5328a68272f35 100644 GIT binary patch delta 1231 zcmbQp{()1mGr-TCmrII^fq{Y7)59f*fq~fy$PQp(29nAWvT73*jq6$3JY5_^D(1YM zmD@MlK%lKz>#O-=>7MGwRa2|vmUvbFSHAK%Kc}E6G19-j3ln@3u2%QRuBUY<f38?@vGLC>)fy9T=(9my<>CBxw)z(?{pRxr*qD=_D1;h zPg2+PX%|^Lq@vu!6>eSs-hWZF;~P-rn*RRO63#`joO7eIC1V>_EKDt7T+{|vnU#Sg zSP#>W5MBKBuk)4VPi0H)O*ouY87vpp7BN$CqtTI5Je^Y&!_qv~@N6`4PD<^VDk-Gx zyynb=2+5?>wj-wmw2f5=DSemo;(Op<%bFwpr#`>^kXX+zUw`oY1^vG-i_+}u&+~h? zgDhw{SI9Znk8`dZ=Ul#8Q7euG0ouF?_q8@Vw$`Q{zgA!kj7;xarjuR2>ig!*zr1f{ zGviw`{uUFxnVK&a{1tz@hRZ&At&t0J(Avs#!Ij@$98oyc8fL|IC&T{NpQ!7Z+s`Zs zh}h%Ot9dxg;OVy2^=qxNtPHa@OrCxxf34Ayu=Jpbo9+D_*)KY6Qx-VLx8(An`Mhbf z7p>*Wkrv!^VMX}ebD^_NZvL@i-D?4#AU}iir``rx&GSEHyTMak?L(-Wwc3KSZ55}Y zOk6&0nQiXz_10sJuI}n>t*Ww9TbC`{u{pAG6W3jKmJ5?*S7drfN_8Kr4=vfGqo}3z z{gOZ5{KKjxH)C!zoqKgz_aY}}&D48+oLyQe*2%h3n?7z?Z>QG0Ix6DQ#eLEb{F61D zmJ8aM>~vI=F453mHT|xK6=c&9@Y~UshardGYc#y%UZ? zR<>1HFJ`U$Ec!A=;b-42XQ$=vPRoPAq%+S;8P$KH=L<{!9eA-rXRi5^%GnF+|9)Aa VbZo=ZmB2EJ!PC{xWt~$(69CN^Kve($ delta 877 zcmV-z1Cspk36TdOiBL{Q4GJ0x0000DNk~Le000230002M1Oos70EFxQ^pPPme*-5; zL_t(|ob8)kZsR}*fITn!Y`6h)g4Omykt*f>N7w=8-(x3kI*BYn)z)E{&jh17#jt!$ zk-y77KSPZBQ7!;fuPAHrMQ*#FvX-`{&v7aE8N5QFAQ7?#kkyFH6$7z3#bsF7ow!J< z;WL5wt1oHK^9NiIpVKLni!r`If9p?k!`9m0maB1K&#AetPx44!ysA7>8W_-1qk=zP^cXl@FK#yc^$mH6=GU`JizC zU-CD_7krG*UOv1adj;kff4QgYldp<#ugaZupP%))vx!{)$6U9llGj`@9N8^uvOQ9D=0}aM;sK6txJLd8R7;zu@o4K;1<3bzXDj$yH%U7H8SN$OEFMy9*-_n~f3F6*uCyVyn#_!cRQk8ZZ8cpNQo|*7B=rl$rZbF(YR}cQxEHsaV>_{H7}{f_tvc zg6fzf9dQ9Db)R){fE{ig-8|&_)DbrB&TF||r(dz*YFk>vL!~ahRX%Lv%N=Mum6@8( za!VPcSx!u&oLJ=pv|VXUKK#BI*SPQDo^CCB?mqt?C$f!r7&{c500000NkvXXu0mjf D1&g+y diff --git a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html index 2e65cbb33..16cd55868 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+ +
+ +

moSteadyFitSolContinue< EOT > Member List

This is the complete list of members for moSteadyFitSolContinue< EOT >, including all inherited members.

@@ -39,8 +42,8 @@ -
countermoSteadyFitSolContinue< EOT > [private]
firstFitnessSavedmoSteadyFitSolContinue< EOT > [private]
maxNumberOfIterationsWithoutImprovementmoSteadyFitSolContinue< EOT > [private]
moSteadyFitSolContinue(unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)moSteadyFitSolContinue< EOT > [inline]
operator()(const EOT &__sol)moSteadyFitSolContinue< EOT > [inline]

Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.4.7
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html index 5fd1711be..db0c280d3 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moSteadyFitSolContinue< EOT > Class Template Reference + +ParadisEO-MOMovingObjects: moSteadyFitSolContinue< EOT > Class Template Reference - +
+ +
+ +

moSteadyFitSolContinue< EOT > Class Template Reference

One possible stopping criterion for a solution-based heuristic. More...

@@ -161,7 +164,7 @@ Indicates if the fitness has not been improved since a number of iterations (aft __sol the current solution. -

Returns:
true or false.
+
Returns:
true or false.

Definition at line 46 of file moSteadyFitSolContinue.h. @@ -200,8 +203,8 @@ References

The documentation for this class was generated from the following file: -
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.4.7
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png index 1fa229f5a6f621f9a28cfe41d6fb900ea669c685..3e43efb5dcdde0938034367fed9553782ece220d 100644 GIT binary patch delta 30 kcmcb>a)D(+6jQ~VjWJIc1=urclo)`()78&qol`;+0HVkVssI20 delta 30 kcmcb>a)D(+6jMa&#+WCJ0(WOz@MQo3Pgg&ebxsLQ0JP-__y7O^ diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html b/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html index d3e59f14f..697fcda77 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

moTS< M > Member List

This is the complete list of members for moTS< M >, including all inherited members.

- - - - - - - - - - - -
className() consteoMonOp< M::EOType > [virtual]
contmoTS< M > [private]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoTS< M > [private]
Fitness typedefmoTS< M > [private]
full_evalmoTS< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< EOType >
moTS(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)moTS< M > [inline]
moTS(moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)moTS< M > [inline]
move_explmoTS< M > [private]
operator()(EOT &__sol)moTS< M > [inline, virtual]
OpType enum nameeoOp< EOType >
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< M::EOType &, bool > [virtual]

Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  + operator()(EOT &__sol)moTS< M > [inline] +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s.html b/trunk/paradiseo-mo/doc/html/classmo_t_s.html index 805893b65..e14169d52 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moTS< M > Class Template Reference +ParadisEO-MOMovingObjects: moTS< M > Class Template Reference @@ -8,6 +8,7 @@
- eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -188,7 +185,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -229,7 +226,7 @@ template<class M> EOT &  __sol  )  - [inline, virtual] + [inline] @@ -246,8 +243,6 @@ Algorithm of the tabu search. As a
Returns:
TRUE.
-

-Implements eoUF< M::EOType &, bool >.

Definition at line 85 of file moTS.h.

@@ -256,7 +251,7 @@ References moTS< M >::co

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s.png b/trunk/paradiseo-mo/doc/html/classmo_t_s.png index 8932f0e2f1113b44d96354bb83e87f7b227be69a..5d6c7b3048073af92db7db2b099a29be87a8a1c0 100644 GIT binary patch delta 417 zcmV;S0bc&!3&{f^iBL{Q4GJ0x0000DNk~Le0001u0000`1Oos70M^j!XOST@e*s@f zL_t(|obA<1j>8}f08rS>8v6$31f%JNy2|~JFg7+R1loLrMv(^cX_CUjv612)L)y3d zi6h!{PC1zNqLCdD0OS-YUF&4Ga|L`r4w4l1*#mf%QBvx z!_TaHKc4KA`H2>NRWHQ%`QZ|&Q`bwALF@Wiqw3Ua+o-ofHXSyrsN>MS)2_x|Jb=xk zCY&SAl{TF{XViD+KzknP^moqJaxZ6Dp0{%DRpSPcNh}#bgny| z>%isAcXnKfC&)g0INJK#mqP|{F2c`v(qN8|Bsb;L+kcKXo1 zP71B^aBoz?sh1e)-D!7>$Ga;>1Bnuzusdjvu zsbC5^CDd}*YZ^<&%4c2mu&EnF(|E8tCL!7Z*?`LSf~C(Z*MR2zIIYq>YXNF zi6F$(=vN@nIywd!9CM~ZRT+Cq?z0|MITQH<>J4bt0H(@Y{B6~{c8Yi-kz`>HI-V_e zj#uhI?`@crr2j5AC2EUvjWbth`1i3~7KtmqMsgEo7-aCEW!*P(?pi6L&^3AJLWeES zs-nS(B4m>25Dl&Jdn;d$RN)c>?7>5QG=7q zl_jv4i$B4v53Rz@_W6{mEy7chc=#80llu zSi`FevL!utMPkgQ2Y$TvTW+a~lowgPF;e$Cm8V$FB8TQ2dxBv?4TK(tckvian{AZt zdsF}x>gq`tQAw7q6HaK|)Kt*|oZIc)++)1*dn*hC^Peg zYg&{!o!*iZmjmYk27oX7R?fLQ>A1Od)(ZDd{N@YMyy3NlqAdBV=GpodZ(}ci66MJY z?iA4RB8^a2CVQGagbAE}?kdf_H~d+h0osJK)y~U@da|RJ`?tnhc*9e!V5ZczCL$!t zrM96IKZ4=TI7?4kP+<@?bD4G8cGdg~U=VE`_G!&0>I;vQIl6MPlAgJJ?&u{X4N#aP z;Uv1mC>&|8+MySffxDi*4-s_HOI^FM_#*7^l@17z!K2XTcZ(6W2WN<3i0#x$Zu^i# zu+ydBJW~32!I1Jn+7_m1Y6{sJhWMUbZcUe{cPXxIEba`sWVn4)b1be8=6^!}rphU` zslUIu<1jOPk7K69sQ>KOdv+%Han8pRMSMUR0Y7$KPD7;;isqA4 zKon**qdK*!H-P67Xv-?Y{?jT@nfq5e$xab4*Nt0-u<<79qFVlTbJz|o6b?u&0sA3w zA4-)OHMrlByQ$f_+;U;AEt)3Gy3REtF4bd(%%&&61E`)=18MSe7+iZKe*mEpt2Rp> zYYL|(>67U)%j|!rVdmvC1P?L}+`2u8`$e-n zx!;=)BzFZ>us=T2F#pXRZiZ7{%D^U!S4c~%3jV{EZm_;)YWDr%?1%!ZgIpR!eIO)G zxn4+vICOb&<$&gCtKYKE~dC1*FM$AZ18IJiPXJSYb+aHN<_oA z51k(6F9RPOr9}*g^JQYtLMqE0PZXm<}y5L j`P-zi5PD1S8&8d4XM$4H3$|O)ePa*?g+=m1DA|7iQoqp{ diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html index f2ed58970..3ec22d6ed 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.png b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.png index 717f30a1788ac8ef51945255e8a0eb8afaa89080..c9608b2deabb5215c09073c147bd24719dee17fe 100644 GIT binary patch delta 621 zcmV-z0+Riy43h;RiBL{Q4GJ0x0000DNk~Le0001@0001p1Oos70G8`5c#$D9e*!5< zL_t(|ob8xPa>F1DhS4T#!404{XfM=N?tg?LA#BXUAv1K6ctoa=2-0Ve>T&X$pVh;B zhqdENiT_G;@|TCTRy;q5ctni(zKq{}KZqC+or@XPNqltZ#fDJM*{6xt6Vu1sAWjey z$g%X6NF0&K=X>;_OQbq_Co>lce`1Xs61_Ol`beW(A<9`fBDBaUVhH)vk}u25?2w|KV4_XZ94LG#QX2t6L0tX z+Y>*c*Gg2P5|yY#B`WcC#P#1uKjC}05<@HF9DiF*$UY5mEc6^_Ly=}9f1U_EWPJSb z@26y+jd&vT5?2w|KV8><19%-#^`1q@)j%aGQHe@aq7s#ODWY9H z3@$zkC~-Y8HVVNae^g%Re|S-9XHMSNx0vG|fmXo83>Xu!3{Tf6XfaTgya7 zwnUymN{$xNZFS^lqMViExAWITtcj@?6%paE$4u<*5mRbP=2@qXL$p%X(V*$nQF;y1 zVs0`mMq@1&y^eLPdYy@#|Hp>|c6XF_LE_X!mAHnu{OS4!jpr#8)>X>@00000NkvXX Hu0mjfvmqXA literal 1577 zcmcgsTTqe-6h`xwiq@!GS}m(PvuKQEq~&@kGTU@BHIv^3Hcd?h6-o%@l3mnr)=M%| z;+mG)u2%klVv15;P*V#P@*4VXg03E8s$9bCl&qkO|4V^Zy;}{(=Ku$C!(anjV5}c8i$9) zrc?oSShj+73LBULIyL_Zsqh`l zPe|xv^_4Se^5%fZMqbU{^X8l$Stp$Pt|R&FqYU! zCzYk_vT8;pcRWkZv~TAdOeSO6Pk{snpuXFV|BJwfMGjZ&PH-o5nAs)@j9^X)v?Wnf z!yR!GZ&gPUwy0b){9i~Sp~&V=W7zmfoyv3#XSghSYESmEo91QA=L0)aJows{TzbEx zOV*UvegRHNM6`X_PTU-?fA*|LO)B>9p~tqqrzX?#!|Hdu^++@(>_pE z+Q+oLD{A8S5CT?6bJb*6IC*s(ePqmAgA7aJW?x9O9~XB{C*?RvfI4g#x9x=A<2ARu zgk_-W-ut`>dbUc9o#C;XQ QbblSR diff --git a/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html b/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html index b954223fd..d3afd03c9 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Member List +ParadisEO-MOMovingObjects: Member List @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -33,13 +34,9 @@

    moTabuList< M > Member List

    This is the complete list of members for moTabuList< M >, including all inherited members.

    - - - - -
    add(const M &__move, const EOT &__sol)=0moTabuList< M > [pure virtual]
    EOT typedefmoTabuList< M >
    functor_category()eoBF< const M &, const M::EOType &, bool > [static]
    init()=0moTabuList< M > [pure virtual]
    operator()(const M &, const M::EOType &)=0eoBF< const M &, const M::EOType &, bool > [pure virtual]
    update()=0moTabuList< M > [pure virtual]
    ~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]

    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html index 5be13c44d..651b8f383 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html +++ b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moTabuList< M > Class Template Reference +ParadisEO-MOMovingObjects: moTabuList< M > Class Template Reference @@ -8,6 +8,7 @@
    -

    moTabuList< M > Class Template Reference

    Class describing a tabu list that a moTS uses. +

    moTabuList< M > Class Template Reference

    Class describing a tabu list that a moTS uses. More...

    #include <moTabuList.h> @@ -38,10 +39,8 @@

    Inheritance diagram for moTabuList< M >:

    -eoBF< const M &, const M::EOType &, bool > -eoFunctorBase -moSimpleMoveTabuList< M > -moSimpleSolutionTabuList< M > +moSimpleMoveTabuList< M > +moSimpleSolutionTabuList< M > List of all members. @@ -136,7 +135,7 @@ Procedure that updates the tabu list content.

    Generally, a counter associated to each saved move is decreased by one.

    -Implemented in moSimpleMoveTabuList< M >, and moSimpleSolutionTabuList< M >. +Implemented in moSimpleMoveTabuList< M >, moSimpleSolutionTabuList< M >, and TwoOptTabuList.

    @@ -161,12 +160,12 @@ Procedure which initialises the tabu list.

    Can be useful if the data structure needs to be allocated before being used.

    -Implemented in moSimpleMoveTabuList< M >, and moSimpleSolutionTabuList< M >. +Implemented in moSimpleMoveTabuList< M >, moSimpleSolutionTabuList< M >, and TwoOptTabuList.

    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.png b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.png index c9d3346ba0cacd9a80360459c91be50ab1054700..7e8228b7f4d57d93b6f00d3e4ff2fe42452fd29b 100644 GIT binary patch delta 854 zcmaFG`-@GnGr-TCmrII^fq{Y7)59f*fq}6L$PQp(29jT!^zThnG_GeB@N{tushIP2 zMsCq#1)jFU^Z&W+YP=!6Mf}y7b5H)cM@$fS@ME!sG{@HkThs(*hW86tOuqegi)2Rj zw;B)s8JRZ!m#o z@aSmd1trKRi^pxS1#;gM>850+=uUYgzNYmZ_vU-zf23;Sml&UF5i+{=EB`=HU|8~& z{f{d@&NtJ1l^b;B2Ha)qK6;;v{9RGbpuaIY;LiU0vIn)_2#Lsl|Gm53xuP+)`H|A@ z>Y$$F$w@M^MIPT+B5~Yp$&T+E-d__r%et$>MEr%)rI-cX9>tA%N~8!p(44q_^0)6x z>g6Z;U%&Ftz_oayXP~Nq<|Qe%ijt9?LVAf6besq*0-3vhE?&PzX&_moa6^51q2?yIcVIoN&Hk)1GCK{2L(>! zJG@Uq|MZ@yFI<#yDn@1HXS&p_P|VO`TXb0h1 literal 1770 zcmbW2e>Br;9LHDstyI*#!fq)g`5o>t-$_EFGGf(TwS=*eq*jyG#Vw~5Yl`IOMhO+i z%!Vc87M6`|O0pkGt(hPDCJp(Kc2|Gs+|KQv`^WovKF{a*d_Lzn=lwe8x#EvREL&o< z1OkC9^YQi!fI#NDXye9tI@(q9p|eQ48T#)*d1*A7uNh5ae*V#G+UT1a8yiWFHSe^? zIi~}VfspNe-Qf_(f6T=iU^3lg zW{eMnCDr5q@-)q}iXtcH%#55|@#qV%Tw`*^pFG0PUnp@G>0KbMU|-}=p*YIEl|ZBWkV^=D=`wF(K=asROq3-)5le3Q^7mOK4o-F>JvLTfjQTQz&emqC_wjM z7xQz@3wUxWbNsjv?Y0P9hhOLpESi0k^DSD(+UJ`EIHh5Hs!eaFNbju!rM$OIq}TgN zsqEKBE(NzcZ`ttgrUK}^ALslmRUS#!yh`d#Xfd4~u|s@?u)2Lb=~PL)oZYglY|1zN z1*Qj6!`z!&^XH>P=tH-lj@1?e-DOfqQ=f<5V4kWxzq*J1=8THtXv$!1u$24Ov4Tt5 zKBgE1xWW7Pxi(AayP}TVazJqG?EV&DeU8&N3PR2GGKYlH|?Yt}3W4#!GdB=^?gA zm9gcA#n&^P7%zw-PNEaZh;QC?ek;?a-o(w!XXNv7{yZP!9jl5dpL18 zR~g?gg_%!o4dE8qwmuz>y)(axaC4=vEkQ6fH}^ywv0|o+6m%+P4d8b^iKb90_&jog71RNi+4erDaQ zVc+PTt-4$)$!?3wLhw1kMwrC!cjX}^c}I(@mse%IPf&O>LQ3FK&vd~qtJv2a0!M4I zUG`{&BK)A4Ri=#CMy?BvI|Q(<#P>~9+zq4Or&+w(WT`euNGmEi8wacps)+N&8`NrrL@Tt;F5>kydlI!&InI^Q6k;$v!s_SRiqaX>qzhgyfyPS^!;y2>TDX zo1DP&^s9D~%bO@R1?Ci+?FKu46=_wlxKOuWD^XI%{86p&kNfAI)52|dcUqj4xKSNC7|7nkDi>9{LOlYpv=P?Qr5ZwEYU(A4#E&Zrwkzm_bx0^~O_AXZg z^|5D;6gt3`*EgR6s{SzO7+$T;qDdnUBmIOCtSXyy4-&?5hxIt30wdZ$ltsGf+t=$Q z)C|@}TN9)BcP=%!V>5K`4lK65NDieLRpEWgaimX(kz}(>&+1;`iMnX*p56nKX7?1h>>K z+!n2bp*X@6O%81)vd%FzoVzRbxv3C#yB>RD_vMKOIs&|5Zarq0?of*nIH&UO;aQdP zQ|fVR^)!`E24$$gpe$oRP^OxYbyPa7c@#Sa59gj4d)m;9JXg8zT1{pdfmKQHmWuC( zzZAG^b49Q-wNy1oi73~p*0IDwE|lQ#-h2Jjrxqy6cQq>*(G@F4Mvz|{#|AXSfdilw za~oP=ocoN2+2hSXD|rIwZ%h{EYU$#klXuJK7t<91cWc|_?pN@iczRa-4{C~qP1$bk z&xbP-*hYSUp~U?I!~Z*OpJDwvX`#*^401y!bWIjqG|P(GX{-I1AU + +ParadisEO-MOMovingObjects: edge_xover.cpp Source File + + + + +
    +
    + + + + +
    + +
    • +
+
+

edge_xover.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "edge_xover.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include <assert.h>
+00013 
+00014 #include <utils/eoRNG.h>
+00015 
+00016 #include "edge_xover.h"
+00017 #include "route_valid.h"
+00018 
+00019 #define MAXINT 1000000
+00020 
+00021 void
+00022 EdgeXover :: build_map (const Route & __par1, const Route & __par2) 
+00023 {
+00024   
+00025   unsigned int len = __par1.size () ;
+00026   
+00027   /* Initialization */
+00028   _map.clear () ;
+00029   _map.resize (len) ;
+00030   
+00031   for (unsigned int i = 0 ; i < len ; i ++) 
+00032     {
+00033       _map [__par1 [i]].insert (__par1 [(i + 1) % len]) ;
+00034       _map [__par2 [i]].insert (__par2 [(i + 1) % len]) ;
+00035       _map [__par1 [i]].insert (__par1 [(i - 1 + len) % len]) ;
+00036       _map [__par2 [i]].insert (__par2 [(i - 1 + len) % len]) ;
+00037     }
+00038   
+00039   visited.clear () ;
+00040   visited.resize (len, false) ;
+00041 }
+00042 
+00043 void
+00044 EdgeXover :: remove_entry (unsigned int __vertex, std :: vector <std :: set <unsigned int> > & __map) 
+00045 {
+00046   
+00047   std :: set <unsigned int> & neigh = __map [__vertex] ;
+00048 
+00049   for (std :: set <unsigned int> :: iterator it = neigh.begin () ; it != neigh.end () ; it ++)
+00050     {
+00051       __map [* it].erase (__vertex) ; 
+00052     }
+00053       
+00054 }
+00055 
+00056 void
+00057 EdgeXover :: add_vertex (unsigned int __vertex, Route & __child) 
+00058 {
+00059   visited [__vertex] = true ;
+00060   __child.push_back (__vertex) ;    
+00061   remove_entry (__vertex, _map) ; /* Removing entries */    
+00062 }
+00063 
+00064 void
+00065 EdgeXover :: cross (const Route & __par1, const Route & __par2, Route & __child) {
+00066   
+00067   build_map (__par1, __par2) ;
+00068   
+00069   unsigned int len = __par1.size () ;
+00070  
+00071   /* Go ! */
+00072   __child.clear () ;
+00073   
+00074   unsigned int cur_vertex = rng.random (len) ;
+00075   
+00076   add_vertex (cur_vertex, __child) ;
+00077 
+00078   for (unsigned int i = 1 ; i < len ; i ++) {
+00079     
+00080     unsigned int len_min_entry = MAXINT ;
+00081     
+00082     std :: set <unsigned int> & neigh = _map [cur_vertex] ;
+00083     
+00084     for (std :: set <unsigned int> :: iterator it = neigh.begin () ; it != neigh.end () ; it ++) 
+00085       {      
+00086         unsigned int l = _map [* it].size () ;
+00087         if (len_min_entry > l)
+00088           {
+00089             len_min_entry = l ;
+00090           }
+00091       }
+00092     
+00093     std :: vector <unsigned int> cand ; /* Candidates */
+00094     
+00095     for (std :: set <unsigned> :: iterator it = neigh.begin () ; it != neigh.end () ;  it ++) 
+00096       {      
+00097         unsigned int l = _map [* it].size () ;
+00098         if (len_min_entry == l)
+00099           {
+00100             cand.push_back (* it) ;
+00101           }
+00102       }
+00103        
+00104     if (! cand.size ()) 
+00105       {
+00106         
+00107         /* Oh no ! Implicit mutation */      
+00108         for (unsigned int j = 0 ; j < len ; j ++)
+00109           {
+00110             if (! visited [j])
+00111               {
+00112                 cand.push_back (j) ;
+00113               }
+00114           }
+00115       }
+00116     
+00117     cur_vertex = cand [rng.random (cand.size ())] ;
+00118     
+00119     add_vertex (cur_vertex, __child) ;
+00120   } 
+00121 }
+00122 
+00123 bool
+00124 EdgeXover :: operator () (Route & __route1, Route & __route2) 
+00125 {
+00126   
+00127   // Init. copy
+00128   Route par [2] ;
+00129   par [0] = __route1 ;
+00130   par [1] = __route2 ;
+00131   
+00132   cross (par [0], par [1], __route1) ;
+00133   cross (par [1], par [0], __route2) ;
+00134   
+00135   assert (valid (__route1)) ;
+00136   assert (valid (__route2)) ;
+00137 
+00138   __route1.invalidate () ;
+00139   __route2.invalidate () ;
+00140 
+00141   return true ;
+00142 }
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/edge__xover_8h-source.html b/trunk/paradiseo-mo/doc/html/edge__xover_8h-source.html new file mode 100644 index 000000000..9fb1a6145 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/edge__xover_8h-source.html @@ -0,0 +1,76 @@ + + +ParadisEO-MOMovingObjects: edge_xover.h Source File + + + + +
+ +
+

edge_xover.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "edge_xover.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* TEXT LICENCE
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef edge_xover_h
+00013 #define edge_xover_h
+00014 
+00015 #include <vector>
+00016 #include <set>
+00017 
+00018 #include <eoOp.h>
+00019 
+00020 #include "route.h"
+00021 
+00023 class EdgeXover : public eoQuadOp <Route> 
+00024 {
+00025   
+00026 public :
+00027   
+00028   bool operator () (Route & __route1, Route & __route2) ;
+00029 
+00030 private :
+00031   
+00032   void cross (const Route & __par1, const Route & __par2, Route & __child) ; /* Binary */
+00033 
+00034   void remove_entry (unsigned int __vertex, std :: vector <std :: set <unsigned> > & __map) ;
+00035   /* Updating the map of entries */
+00036 
+00037   void build_map (const Route & __par1, const Route & __par2) ;
+00038 
+00039   void add_vertex (unsigned int __vertex, Route & __child) ;
+00040 
+00041   std :: vector <std :: set <unsigned int> > _map ; /* The handled map */
+00042 
+00043   std :: vector <bool> visited ; /* Vertices that are already visited */
+00044 
+00045 } ;
+00046 
+00047 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/files.html b/trunk/paradiseo-mo/doc/html/files.html index 980c498ef..6e4112515 100644 --- a/trunk/paradiseo-mo/doc/html/files.html +++ b/trunk/paradiseo-mo/doc/html/files.html @@ -1,6 +1,6 @@ -PARADISEO-MO: File Index +ParadisEO-MOMovingObjects: File Index @@ -8,6 +8,7 @@
-

PARADISEO-MO File List

Here is a list of all documented files with brief descriptions: +

ParadisEO-MOMovingObjects File List

Here is a list of all documented files with brief descriptions:
+ + + + + + + + + + + + + @@ -46,17 +60,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
city_swap.cpp [code]
city_swap.h [code]
edge_xover.cpp [code]
edge_xover.h [code]
graph.cpp [code]
graph.h [code]
hill_climbing.cpp [code]
index.h [code]
iterated_local_search.cpp [code]
mix.h [code]
mo.h [code]
moAlgo.h [code]
moAspirCrit.h [code]
moBestImprSelect.h [code]
moComparator.h [code]
moCoolingSchedule.h [code]
moExponentialCoolingSchedule.h [code]
moFirstImprSelect.h [code]
moFitComparator.h [code]
moFitSolContinue.h [code]
moGenSolContinue.h [code]
moHC.h [code]
moHCMoveLoopExpl.h [code]
moILS.h [code]
moImprBestFitAspirCrit.h [code]
moItRandNextMove.h [code]
moLinearCoolingSchedule.h [code]
moMoveSelect.h [code]
moNextMove.h [code]
moNoAspirCrit.h [code]
moNoFitImprSolContinue.h [code]
moRandImprSelect.h [code]
moRandMove.h [code]
moSA.h [code]
moSimpleMoveTabuList.h [code]
moSimpleSolutionTabuList.h [code]
moSolContinue.h [code]
moSteadyFitSolContinue.h [code]
moTabuList.h [code]
moTS.h [code]
moTSMoveLoopExpl.h [code]
order_xover.cpp [code]
order_xover.h [code]
part_route_eval.cpp [code]
part_route_eval.h [code]
part_two_opt_init.cpp [code]
part_two_opt_init.h [code]
part_two_opt_next.cpp [code]
part_two_opt_next.h [code]
partial_mapped_xover.cpp [code]
partial_mapped_xover.h [code]
route.h [code]
route_eval.cpp [code]
route_eval.h [code]
route_init.cpp [code]
route_init.h [code]
route_valid.cpp [code]
route_valid.h [code]
simulated_annealing.cpp [code]
t-mo.cpp [code]
tabu_search.cpp [code]
two_opt.cpp [code]
two_opt.h [code]
two_opt_incr_eval.cpp [code]
two_opt_incr_eval.h [code]
two_opt_init.cpp [code]
two_opt_init.h [code]
two_opt_next.cpp [code]
two_opt_next.h [code]
two_opt_rand.cpp [code]
two_opt_rand.h [code]
two_opt_tabu_list.cpp [code]
two_opt_tabu_list.h [code]
-
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/functions.html b/trunk/paradiseo-mo/doc/html/functions.html index 73c5af995..122495563 100644 --- a/trunk/paradiseo-mo/doc/html/functions.html +++ b/trunk/paradiseo-mo/doc/html/functions.html @@ -1,6 +1,6 @@ -PARADISEO-MO: Class Members +ParadisEO-MOMovingObjects: Class Members @@ -8,6 +8,7 @@

- c -

- e -

- g -

Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html index 708582241..ae87e0d73 100644 --- a/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moBestImprSelect.h Source File +ParadisEO-MOMovingObjects: moBestImprSelect.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_comparator_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_comparator_8h-source.html new file mode 100644 index 000000000..97bc7e9f1 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/mo_comparator_8h-source.html @@ -0,0 +1,52 @@ + + +ParadisEO-MOMovingObjects: moComparator.h Source File + + + + +
+ +
+

moComparator.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "moComparator.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2007
+00006 
+00007 /* TEXT LICENCE
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef __moComparator_h
+00013 #define __moComparator_h
+00014 
+00015 
+00017 
+00020 template<class EOT>
+00021 class moComparator: public eoBF<const EOT&, const EOT&, bool>
+00022 {
+00023 };
+00024 
+00025 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html index 9840b9fdb..d85f48936 100644 --- a/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moCoolingSchedule.h Source File +ParadisEO-MOMovingObjects: moCoolingSchedule.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html index e37f3b8e7..12be6dc16 100644 --- a/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moExponentialCoolingSchedule.h Source File +ParadisEO-MOMovingObjects: moExponentialCoolingSchedule.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html index a64e0c516..fc45cf98a 100644 --- a/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moFirstImprSelect.h Source File +ParadisEO-MOMovingObjects: moFirstImprSelect.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_fit_comparator_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_fit_comparator_8h-source.html new file mode 100644 index 000000000..cc3a6e223 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/mo_fit_comparator_8h-source.html @@ -0,0 +1,56 @@ + + +ParadisEO-MOMovingObjects: moFitComparator.h Source File + + + + +
+ +
+

moFitComparator.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "moFitComparator.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2007
+00006 
+00007 /* TEXT LICENCE
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef __moFitComparator_h
+00013 #define __moFitComparator_h
+00014 
+00016 
+00019 template<class EOT>
+00020 class moFitComparator: public moComparator<EOT>
+00021 {
+00022  public:
+00023   bool operator()(const EOT& _solution1, const EOT& _solution2)
+00024   {
+00025     return _solution1.fitness()>_solution2.fitness();
+00026   }
+00027 };
+00028 
+00029 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html index a766fd675..c2d8e95fc 100644 --- a/trunk/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html @@ -1,15 +1,16 @@ - -PARADISEO-MO: moFitSolContinue.h Source File + +ParadisEO-MOMovingObjects: moFitSolContinue.h Source File - +
+ +

moFitSolContinue.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moFitSolContinue.h"
@@ -38,40 +40,40 @@
 00015 #include "moSolContinue.h"
 00016 
 00018 
-00021 template < class EOT > class moFitSolContinue:public moSolContinue < EOT >
+00021 template < class EOT > class moFitSolContinue:public moSolContinue < EOT >
 00022 {
 00023 
 00024 public:
 00025 
-00027   typedef typename EOT::Fitness Fitness;
+00027   typedef typename EOT::Fitness Fitness;
 00028 
 00030 
-00033   moFitSolContinue (Fitness __fitness): fitness (__fitness)
+00033   moFitSolContinue (Fitness __fitness): fitness (__fitness)
 00034   {}
 00035 
 00037 
-00043   bool operator   () (const EOT & __sol)
+00043   bool operator   () (const EOT & __sol)
 00044   {
 00045     if(__sol.invalid())
 00046       {
 00047         return true;
 00048       }
 00049 
-00050     return __sol.fitness() < fitness;
+00050     return __sol.fitness() < fitness;
 00051   }
 00052 
 00054 
-00057   void init ()
+00057   void init ()
 00058   {}
 00059 
 00060 private:
 00061 
-00063   Fitness fitness;
+00063   Fitness fitness;
 00064 };
 00065 
 00066 #endif
-
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.4.7
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html index fa7c02efa..731979d94 100644 --- a/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moGenSolContinue.h Source File +ParadisEO-MOMovingObjects: moGenSolContinue.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html index e27490ad1..e6d9c65d2 100644 --- a/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moHC.h Source File +ParadisEO-MOMovingObjects: moHC.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html index 2bb7dea2c..85ac1fc1e 100644 --- a/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moHCMoveLoopExpl.h Source File +ParadisEO-MOMovingObjects: moHCMoveLoopExpl.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_i_l_s_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_i_l_s_8h-source.html new file mode 100644 index 000000000..8ce3cd008 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/mo_i_l_s_8h-source.html @@ -0,0 +1,156 @@ + + +ParadisEO-MOMovingObjects: moILS.h Source File + + + + +
+ +
+

moILS.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "moILS.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2007
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef __moILS_h
+00013 #define __moILS_h
+00014 
+00015 #include <eoEvalFunc.h>
+00016 
+00017 #include "moHC.h"
+00018 #include "moTS.h"
+00019 #include "moSA.h"
+00020 
+00022 
+00025 template < class M > class moILS:public moAlgo < typename M::EOType >
+00026 {
+00027 
+00029   typedef typename M::EOType EOT;
+00030   
+00032   typedef typename EOT::Fitness Fitness;
+00033 
+00034 public:
+00035 
+00037 
+00046   moILS (moAlgo<EOT> &__algo, moSolContinue <EOT> &__continue, moComparator<EOT> &__acceptance_criterion, eoMonOp<EOT> &__perturbation, 
+00047          eoEvalFunc<EOT> &__full_eval):
+00048     algo(__algo), cont(__continue), acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval)
+00049   {}
+00050 
+00052 
+00062   moILS (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval,
+00063          moMoveSelect < M > &__move_select, moSolContinue <EOT> &__continue, moComparator<EOT> &__acceptance_criterion, 
+00064          eoMonOp<EOT> &__perturbation, eoEvalFunc<EOT> &__full_eval):
+00065     algo(*new moHC<M>(__move_init, __next_move, __incr_eval, __move_select, __full_eval)), cont(__continue), 
+00066     acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval)
+00067   {}
+00068 
+00070 
+00082   moILS (moMoveInit <M> &__move_init, moNextMove <M> &__next_move, moMoveIncrEval <M> &__incr_eval,
+00083          moTabuList <M> &__tabu_list, moAspirCrit <M> &__aspir_crit, moSolContinue <EOT> &__moTS_continue, 
+00084          moSolContinue <EOT> &__continue, moComparator<EOT> &__acceptance_criterion, eoMonOp<EOT> &__perturbation, 
+00085          eoEvalFunc<EOT> &__full_eval):
+00086     algo(*new moTS<M>(__move_init, __next_move, __incr_eval, __tabu_list, __aspir_crit, __moTS_continue, __full_eval)), 
+00087     cont(__continue), acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval)
+00088   {}
+00089 
+00091 
+00102   moILS (moRandMove<M> &__move_rand, moMoveIncrEval <M> &__incr_eval, moSolContinue <EOT> &__moSA_continue, double __init_temp,
+00103          moCoolingSchedule & __cool_sched, moSolContinue <EOT> &__continue, moComparator<EOT> &__acceptance_criterion, 
+00104          eoMonOp<EOT> &__perturbation, eoEvalFunc<EOT> &__full_eval):
+00105     algo(*new moSA<M>(__move_rand, __incr_eval, __moSA_continue, init_temp, __cool_sched, __full_eval)), 
+00106     cont(__continue), acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval)
+00107   {}
+00108 
+00109 
+00110 
+00112 
+00119   bool operator()(EOT & __sol)
+00120   {
+00121     EOT __sol_saved=__sol;
+00122             
+00123     cont.init ();
+00124 
+00125     //some code has been duplicated in order to avoid one perturbation and one evaluation without adding a test in the loop.
+00126 
+00127     //std::cout << "Before intensification: " << __sol.fitness() << std::endl; 
+00128     algo(__sol);
+00129     //std::cout << "After intensification: " << __sol.fitness() << std::endl; 
+00130     
+00131     if(acceptance_criterion(__sol, __sol_saved))
+00132       {
+00133         std::cout << "Accepted: " << __sol.fitness() << std::endl;
+00134         __sol_saved=__sol;
+00135         
+00136       }
+00137     else
+00138       {
+00139         //std::cout << "Refused" << std::endl;
+00140         __sol=__sol_saved;
+00141       }
+00142     
+00143     while (cont (__sol))
+00144     {
+00145       perturbation(__sol);
+00146       full_eval(__sol);
+00147       
+00148       //std::cout << "Before intensification: " << __sol.fitness() << std::endl; 
+00149       algo(__sol);
+00150       //std::cout << "After intensification: " << __sol.fitness() << std::endl; 
+00151       
+00152       if(acceptance_criterion(__sol, __sol_saved))
+00153         {
+00154           std::cout << "Accepted: " << __sol.fitness() << std::endl;
+00155           __sol_saved=__sol;
+00156         }
+00157       else
+00158         {
+00159           //std::cout << "Refused" << std::endl;
+00160           __sol=__sol_saved;
+00161         }
+00162     }
+00163     
+00164     return true;
+00165   }
+00166 
+00167 private:
+00168 
+00170   moAlgo<EOT> &algo;
+00171 
+00173   moSolContinue<EOT> &cont;
+00174 
+00176   moComparator<EOT> &acceptance_criterion;
+00177 
+00179   eoMonOp<EOT> &perturbation;
+00180   
+00182   eoEvalFunc<EOT> &full_eval;
+00183 };
+00184 
+00185 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html index 7c45e8c0d..e98f43ca7 100644 --- a/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moImprBestFitAspirCrit.h Source File +ParadisEO-MOMovingObjects: moImprBestFitAspirCrit.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html index e9dcdd82a..0eec90615 100644 --- a/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moItRandNextMove.h Source File +ParadisEO-MOMovingObjects: moItRandNextMove.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html index 87fe11bc9..795c73cca 100644 --- a/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moLSCheckPoint.h Source File +ParadisEO-MOMovingObjects: moLSCheckPoint.h Source File @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -39,7 +40,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00021 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename +00021 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename 00022 M::EOType &, void > 00023 { 00024 @@ -65,7 +66,7 @@ 00054 00055 private: 00056 -00058 std::vector < eoBF < const +00058 std::vector < eoBF < const 00059 M &, const 00060 typename 00061 M::EOType &, void >*> @@ -74,7 +75,7 @@ 00064 }; 00065 00066 #endif -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html index b4350f947..5ebc9c446 100644 --- a/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moLinearCoolingSchedule.h Source File +ParadisEO-MOMovingObjects: moLinearCoolingSchedule.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html index d7cf4fe67..14b822497 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMove.h Source File +ParadisEO-MOMovingObjects: moMove.h Source File @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -39,7 +40,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00023 template < class EOT > class moMove:public eoUF < EOT &, void > +00023 template < class EOT > class moMove:public eoUF < EOT &, void > 00024 { 00025 00026 public: @@ -48,7 +49,7 @@ 00030 }; 00031 00032 #endif -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html index 220136ef2..bf830781d 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMoveExpl.h Source File +ParadisEO-MOMovingObjects: moMoveExpl.h Source File @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -39,7 +40,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00021 template < class M > class moMoveExpl:public eoBF < const typename +00021 template < class M > class moMoveExpl:public eoBF < const typename 00022 M::EOType &, 00023 typename 00024 M::EOType &, void > @@ -48,7 +49,7 @@ 00027 }; 00028 00029 #endif -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html index ca863d2b6..5a34aad22 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMoveIncrEval.h Source File +ParadisEO-MOMovingObjects: moMoveIncrEval.h Source File @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -39,7 +40,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00024 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename +00024 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename 00025 M::EOType &, 00026 typename 00027 M::EOType::Fitness > @@ -48,7 +49,7 @@ 00030 }; 00031 00032 #endif -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html index f136fa12b..ba9767ca3 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMoveInit.h Source File +ParadisEO-MOMovingObjects: moMoveInit.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html index 0bb9f770a..679a9fc4c 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMoveLoopExpl.h Source File +ParadisEO-MOMovingObjects: moMoveLoopExpl.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html index 3f066af39..40cd60d59 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moMoveSelect.h Source File +ParadisEO-MOMovingObjects: moMoveSelect.h Source File @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -45,7 +46,7 @@ 00024 }; 00025 00027 -00032 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &, +00032 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &, 00033 void > 00034 { 00035 public: @@ -66,7 +67,7 @@ 00063 }; 00064 00065 #endif -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html index 7020d03de..d78d3aa4a 100644 --- a/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moNextMove.h Source File +ParadisEO-MOMovingObjects: moNextMove.h Source File @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -39,7 +40,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class M > class moNextMove:public eoBF < M &, const typename +00022 template < class M > class moNextMove:public eoBF < M &, const typename 00023 M::EOType &, 00024 bool > 00025 { @@ -47,7 +48,7 @@ 00027 }; 00028 00029 #endif -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html index dd38ac219..874d1ff15 100644 --- a/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moNoAspirCrit.h Source File +ParadisEO-MOMovingObjects: moNoAspirCrit.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html index 5b3703006..8c6bea79b 100644 --- a/trunk/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html @@ -1,15 +1,16 @@ - -PARADISEO-MO: moNoFitImprSolContinue.h Source File + +ParadisEO-MOMovingObjects: moNoFitImprSolContinue.h Source File - +
+ +

moNoFitImprSolContinue.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moNoFitImprSolContinue.h"
@@ -38,70 +40,70 @@
 00015 #include "moSolContinue.h"
 00016 
 00018 
-00021 template < class EOT > class moNoFitImprSolContinue:public moSolContinue < EOT >
+00021 template < class EOT > class moNoFitImprSolContinue:public moSolContinue < EOT >
 00022 {
 00023 
 00024 public:
 00025 
-00027   typedef typename EOT::Fitness Fitness;
+00027   typedef typename EOT::Fitness Fitness;
 00028 
 00030 
-00033   moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement)
-00034     : maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement), firstFitnessSaved(true), counter(0) 
+00033   moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement)
+00034     : maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement), firstFitnessSaved(true), counter(0) 
 00035   {}
 00036 
 00038 
-00043   bool operator   () (const EOT & __sol)
+00043   bool operator   () (const EOT & __sol)
 00044   {
 00045     if(__sol.invalid())
 00046       {
 00047         return true;
 00048       }
 00049 
-00050     if(firstFitnessSaved)
+00050     if(firstFitnessSaved)
 00051       {
-00052         fitness=__sol.fitness();
-00053         counter=0;
+00052         fitness=__sol.fitness();
+00053         counter=0;
 00054         firstFitnessSaved=false;
 00055         return true;
 00056       }
 00057     
-00058     counter++;
+00058     counter++;
 00059 
-00060     if( __sol.fitness() > fitness)
+00060     if( __sol.fitness() > fitness)
 00061       {
-00062         fitness=__sol.fitness();
-00063         counter=0;
+00062         fitness=__sol.fitness();
+00063         counter=0;
 00064       }
 00065   
-00066     if(counter==maxNumberOfIterationsWithoutImprovement)
+00066     if(counter==maxNumberOfIterationsWithoutImprovement)
 00067       {
-00068         std::cout << "moNoFitImrpSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
+00068         std::cout << "moNoFitImrpSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
 00069       }
-00070     return counter!=maxNumberOfIterationsWithoutImprovement;
+00070     return counter!=maxNumberOfIterationsWithoutImprovement;
 00071   }
 00072 
 00074 
-00077   void init ()
+00077   void init ()
 00078   {
-00079     firstFitnessSaved=true;
-00080     counter=0;
+00079     firstFitnessSaved=true;
+00080     counter=0;
 00081   }
 00082 
 00083 private:
 00084 
-00086   unsigned int maxNumberOfIterationsWithoutImprovement;
+00086   unsigned int maxNumberOfIterationsWithoutImprovement;
 00087 
-00089   bool firstFitnessSaved;
+00089   bool firstFitnessSaved;
 00090 
-00092   Fitness fitness;
+00092   Fitness fitness;
 00093 
-00095   unsigned int counter;
+00095   unsigned int counter;
 00096 };
 00097 
 00098 #endif
-
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.4.7
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html index cbaa03028..17439e508 100644 --- a/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moRandImprSelect.h Source File +ParadisEO-MOMovingObjects: moRandImprSelect.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html index 208a467ad..6832171b4 100644 --- a/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moRandMove.h Source File +ParadisEO-MOMovingObjects: moRandMove.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html index 73280805a..66f8f1d63 100644 --- a/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moSA.h Source File +ParadisEO-MOMovingObjects: moSA.h Source File @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -105,7 +106,7 @@ 00102 00103 Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness (); 00104 -00105 if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp)) +00105 if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp)) 00106 { 00107 00108 __sol.fitness (incr_eval (move, __sol)); @@ -144,7 +145,7 @@ 00147 }; 00148 00149 #endif -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html index 920e30ae3..aca16e63c 100644 --- a/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moSimpleMoveTabuList.h Source File +ParadisEO-MOMovingObjects: moSimpleMoveTabuList.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html index 82d9c6b5e..b75356f88 100644 --- a/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moSimpleSolutionTabuList.h Source File +ParadisEO-MOMovingObjects: moSimpleSolutionTabuList.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html index 708556b1c..bc7e2cb88 100644 --- a/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moSolContinue.h Source File +ParadisEO-MOMovingObjects: moSolContinue.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html index 0e8be7d36..f156d2de1 100644 --- a/trunk/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html @@ -1,15 +1,16 @@ - -PARADISEO-MO: moSteadyFitSolContinue.h Source File + +ParadisEO-MOMovingObjects: moSteadyFitSolContinue.h Source File - +
+ +

moSteadyFitSolContinue.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moSteadyFitSolContinue.h"
@@ -38,28 +40,28 @@
 00015 #include "moSolContinue.h"
 00016 
 00018 
-00021 template < class EOT > class moSteadyFitSolContinue:public moSolContinue < EOT >
+00021 template < class EOT > class moSteadyFitSolContinue:public moSolContinue < EOT >
 00022 {
 00023 
 00024 public:
 00025 
-00027   typedef typename EOT::Fitness Fitness;
+00027   typedef typename EOT::Fitness Fitness;
 00028 
 00030 
-00034   moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)
-00035     : maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement),
-00036       maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0) 
+00034   moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)
+00035     : maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement),
+00036       maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0) 
 00037   {}
 00038 
 00040 
-00046   bool operator   () (const EOT & __sol)
+00046   bool operator   () (const EOT & __sol)
 00047   {
-00048     if(!maxNumberOfIterationsReached)
+00048     if(!maxNumberOfIterationsReached)
 00049       {
-00050         maxNumberOfIterationsReached=((++counter)==maxNumberOfIterations);
-00051         if(maxNumberOfIterationsReached)
+00050         maxNumberOfIterationsReached=((++counter)==maxNumberOfIterations);
+00051         if(maxNumberOfIterationsReached)
 00052           {
-00053             std::cout << "moSteadyFitSolContinue: Done the minimum number of iterations [" << counter << "]." << std::endl;
+00053             std::cout << "moSteadyFitSolContinue: Done the minimum number of iterations [" << counter << "]." << std::endl;
 00054           }
 00055         return true;
 00056       }
@@ -69,55 +71,55 @@
 00060         return true;
 00061       }
 00062 
-00063     if(firstFitnessSaved)
+00063     if(firstFitnessSaved)
 00064       {
-00065         fitness=__sol.fitness();
-00066         counter=0;
+00065         fitness=__sol.fitness();
+00066         counter=0;
 00067         firstFitnessSaved=false;
 00068         return true;
 00069       }
 00070     
-00071     counter++;
+00071     counter++;
 00072 
-00073     if( __sol.fitness() > fitness )
+00073     if( __sol.fitness() > fitness )
 00074       {
-00075         fitness=__sol.fitness();
-00076         counter=0;
+00075         fitness=__sol.fitness();
+00076         counter=0;
 00077       }
 00078   
-00079     if(counter==maxNumberOfIterationsWithoutImprovement)
+00079     if(counter==maxNumberOfIterationsWithoutImprovement)
 00080       {
-00081         std::cout << "moSteadyFitSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
+00081         std::cout << "moSteadyFitSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
 00082       }
-00083     return counter!=maxNumberOfIterationsWithoutImprovement;
+00083     return counter!=maxNumberOfIterationsWithoutImprovement;
 00084   }
 00085 
 00087 
-00090   void init ()
+00090   void init ()
 00091   {
-00092     maxNumberOfIterationsReached=false;
-00093     counter=0;
-00094     firstFitnessSaved=true;
+00092     maxNumberOfIterationsReached=false;
+00093     counter=0;
+00094     firstFitnessSaved=true;
 00095   }
 00096 
 00097 private:
 00098 
-00100   unsigned int maxNumberOfIterations;
+00100   unsigned int maxNumberOfIterations;
 00101 
-00103   unsigned int maxNumberOfIterationsWithoutImprovement;
+00103   unsigned int maxNumberOfIterationsWithoutImprovement;
 00104 
-00106   bool maxNumberOfIterationsReached;
+00106   bool maxNumberOfIterationsReached;
 00107 
-00109   bool firstFitnessSaved;
+00109   bool firstFitnessSaved;
 00110 
-00112   Fitness fitness;
+00112   Fitness fitness;
 00113 
-00115   unsigned int counter;
+00115   unsigned int counter;
 00116 };
 00117 
 00118 #endif
-
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.4.7
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html index f32f7b68f..d0c99d3fc 100644 --- a/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moTS.h Source File +ParadisEO-MOMovingObjects: moTS.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html index 1edcee1e1..7c5163cdd 100644 --- a/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moTSMoveLoopExpl.h Source File +ParadisEO-MOMovingObjects: moTSMoveLoopExpl.h Source File @@ -8,6 +8,7 @@
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html index a7843d915..9fb2667cd 100644 --- a/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moTabuList.h Source File +ParadisEO-MOMovingObjects: moTabuList.h Source File @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -39,7 +40,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class M > class moTabuList:public eoBF < const M &, const typename +00022 template < class M > class moTabuList:public eoBF < const M &, const typename 00023 M::EOType &, 00024 bool > 00025 { @@ -61,7 +62,7 @@ 00054 }; 00055 00056 #endif -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/namespace_graph.html b/trunk/paradiseo-mo/doc/html/namespace_graph.html new file mode 100644 index 000000000..7a92de2a9 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/namespace_graph.html @@ -0,0 +1,63 @@ + + +ParadisEO-MOMovingObjects: Graph Namespace Reference + + + + +
+ +
+
+ +
+

Graph Namespace Reference

+

+ + + + + + + + + + + + + + + + +

Functions

+unsigned size ()
+void computeDistances ()
+void load (const char *__fileName)
+float distance (unsigned int __from, unsigned int __to)

Variables

+static std::vector< std::pair<
+ double, double > > 		vectCoord
+static std::vector< std::vector<
+ unsigned int > > 		dist
+

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/namespacemembers.html b/trunk/paradiseo-mo/doc/html/namespacemembers.html new file mode 100644 index 000000000..8a3082ed5 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/namespacemembers.html @@ -0,0 +1,59 @@ + + +ParadisEO-MOMovingObjects: Class Members + + + + +
+ +
+
+ +
+
+ +
+Here is a list of all documented namespace members with links to the namespaces they belong to: +

+

+
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/namespacemembers_func.html b/trunk/paradiseo-mo/doc/html/namespacemembers_func.html new file mode 100644 index 000000000..1955b4c50 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/namespacemembers_func.html @@ -0,0 +1,55 @@ + + +ParadisEO-MOMovingObjects: Class Members + + + + +
+ +
+
+ +
+
+ +
+  +

+

+
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/namespacemembers_vars.html b/trunk/paradiseo-mo/doc/html/namespacemembers_vars.html new file mode 100644 index 000000000..1b84f357f --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/namespacemembers_vars.html @@ -0,0 +1,51 @@ + + +ParadisEO-MOMovingObjects: Class Members + + + + +
+ +
+
+ +
+
+ +
+  +

+

+
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/namespaces.html b/trunk/paradiseo-mo/doc/html/namespaces.html new file mode 100644 index 000000000..a748a72db --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/namespaces.html @@ -0,0 +1,39 @@ + + +ParadisEO-MOMovingObjects: Namespace Index + + + + +
+ +
+
+ +
+

ParadisEO-MOMovingObjects Namespace List

Here is a list of all documented namespaces with brief descriptions: + +
Graph
+
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/order__xover_8cpp-source.html b/trunk/paradiseo-mo/doc/html/order__xover_8cpp-source.html new file mode 100644 index 000000000..b65d8fad2 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/order__xover_8cpp-source.html @@ -0,0 +1,124 @@ + + +ParadisEO-MOMovingObjects: order_xover.cpp Source File + + + + +
+ +
+

order_xover.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "order_xover.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2002-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include <assert.h>
+00013 #include <vector>
+00014 
+00015 #include <utils/eoRNG.h>
+00016 
+00017 #include "order_xover.h"
+00018 #include "route_valid.h"
+00019 
+00020 void OrderXover :: cross (const Route & __par1, const Route & __par2, Route & __child) 
+00021 {
+00022   
+00023   unsigned int cut = rng.random (__par1.size ()) ;
+00024       
+00025   /* To store vertices that have
+00026      already been crossed */
+00027   std::vector<bool> v;
+00028   v.resize(__par1.size());
+00029   
+00030   for (unsigned int i = 0 ; i < __par1.size () ; i ++)
+00031     {
+00032       v [i] = false ;
+00033     }
+00034 
+00035   /* Copy of the left partial
+00036      route of the first parent */ 
+00037   for (unsigned int i = 0 ; i < cut ; i ++) 
+00038     {
+00039       __child [i] = __par1 [i] ; 
+00040       v [__par1 [i]] = true ;
+00041     }
+00042    
+00043   /* Searching the vertex of the second path, that ended
+00044      the previous first one */
+00045   unsigned int from = 0 ;
+00046   for (unsigned int i = 0 ; i < __par2.size () ; i ++)
+00047     {
+00048       if (__par2 [i] == __child [cut - 1]) 
+00049         {
+00050           from = i ;
+00051           break ;
+00052         }
+00053     }
+00054   
+00055   /* Selecting a direction
+00056      Left or Right */
+00057   char direct = rng.flip () ? 1 : -1 ;
+00058     
+00059   /* Copy of the left vertices from
+00060      the second parent path */
+00061   unsigned int l = cut ;
+00062   
+00063   for (unsigned int i = 0 ; i < __par2.size () ; i ++) 
+00064     {
+00065       unsigned int bidule /* :-) */ = (direct * i + from + __par2.size ()) % __par2.size () ;
+00066       if (! v [__par2 [bidule]]) 
+00067         {
+00068           __child [l ++] = __par2 [bidule] ;
+00069           v [__par2 [bidule]] = true ;
+00070         }
+00071     }
+00072   
+00073   v.clear();
+00074 } 
+00075 
+00076 bool OrderXover :: operator () (Route & __route1, Route & __route2) 
+00077 {
+00078   
+00079   // Init. copy
+00080   Route par [2] ;
+00081   par [0] = __route1 ;
+00082   par [1] = __route2 ;
+00083   
+00084   cross (par [0], par [1], __route1) ;
+00085   cross (par [1], par [0], __route2) ;
+00086   
+00087   assert (valid (__route1)) ;
+00088   assert (valid (__route2)) ;
+00089 
+00090   __route1.invalidate () ;
+00091   __route2.invalidate () ;
+00092 
+00093   return true ;
+00094 }
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/order__xover_8h-source.html b/trunk/paradiseo-mo/doc/html/order__xover_8h-source.html new file mode 100644 index 000000000..290353e00 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/order__xover_8h-source.html @@ -0,0 +1,61 @@ + + +ParadisEO-MOMovingObjects: order_xover.h Source File + + + + +
+ +
+

order_xover.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "order_xover.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef order_xover_h
+00013 #define order_xover_h
+00014 
+00015 #include <eoOp.h>
+00016 
+00017 #include "route.h"
+00018 
+00020 class OrderXover : public eoQuadOp <Route> 
+00021 {
+00022   
+00023 public :
+00024   
+00025   bool operator () (Route & __route1, Route & __route2) ;
+00026   
+00027 private :
+00028   
+00029   void cross (const Route & __par1, const Route & __par2, Route & __child) ;
+00030 } ;
+00031 
+00032 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/part__route__eval_8cpp-source.html b/trunk/paradiseo-mo/doc/html/part__route__eval_8cpp-source.html new file mode 100644 index 000000000..b382150b5 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/part__route__eval_8cpp-source.html @@ -0,0 +1,57 @@ + + +ParadisEO-MOMovingObjects: part_route_eval.cpp Source File + + + + +
+ +
+

part_route_eval.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "part_route_eval.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include "part_route_eval.h"
+00013 #include "graph.h"
+00014 
+00015 PartRouteEval :: PartRouteEval (float __from, float __to) : from (__from), to (__to) {}
+00016 
+00017 void PartRouteEval :: operator () (Route & __route) 
+00018 {
+00019   float len = 0 ;
+00020   
+00021   for (unsigned int i = (unsigned int) (__route.size () * from) ; i < (unsigned int ) (__route.size () * to) ; i ++)
+00022     {
+00023       len -= Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ;
+00024     }
+00025   
+00026   __route.fitness (len) ;
+00027 }
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/part__route__eval_8h-source.html b/trunk/paradiseo-mo/doc/html/part__route__eval_8h-source.html new file mode 100644 index 000000000..ec7e44f3f --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/part__route__eval_8h-source.html @@ -0,0 +1,65 @@ + + +ParadisEO-MOMovingObjects: part_route_eval.h Source File + + + + +
+ +
+

part_route_eval.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "part_route_eval.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT 
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef part_route_eval_h
+00013 #define part_route_eval_h
+00014 
+00015 #include <eoEvalFunc.h>
+00016 
+00017 #include "route.h"
+00018 
+00020 class PartRouteEval : public eoEvalFunc <Route> 
+00021 {
+00022   
+00023 public :
+00024   
+00026   PartRouteEval (float __from, float __to) ;
+00027   
+00028   void operator () (Route & __route) ;
+00029   
+00030 private :
+00031 
+00032   float from, to ;
+00033   
+00034 } ;
+00035 
+00036 
+00037 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/part__two__opt__init_8cpp-source.html b/trunk/paradiseo-mo/doc/html/part__two__opt__init_8cpp-source.html new file mode 100644 index 000000000..ae94307a5 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/part__two__opt__init_8cpp-source.html @@ -0,0 +1,50 @@ + + +ParadisEO-MOMovingObjects: part_two_opt_init.cpp Source File + + + + +
+ +
+

part_two_opt_init.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "part_two_opt_init.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include <utils/eoRNG.h>
+00013 
+00014 #include "part_two_opt_init.h"
+00015 
+00016 void PartTwoOptInit :: operator () (TwoOpt & __move, const Route & __route) 
+00017 {
+00018   __move.first = rng.random (__route.size () - 6) ;
+00019   __move.second = __move.first + 2 ;
+00020 }
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/part__two__opt__init_8h-source.html b/trunk/paradiseo-mo/doc/html/part__two__opt__init_8h-source.html new file mode 100644 index 000000000..dfb7a7df0 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/part__two__opt__init_8h-source.html @@ -0,0 +1,58 @@ + + +ParadisEO-MOMovingObjects: part_two_opt_init.h Source File + + + + +
+ +
+

part_two_opt_init.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "part_two_opt_init.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef part_two_opt_init_h
+00013 #define part_two_opt_init_h
+00014 
+00015 #include <moMoveInit.h>
+00016 
+00017 #include "two_opt.h"
+00018 
+00020 class PartTwoOptInit : public moMoveInit <TwoOpt> 
+00021 {
+00022   
+00023 public :
+00024   
+00025   void operator () (TwoOpt & __move, const Route & __route) ;
+00026   
+00027 } ;
+00028 
+00029 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/part__two__opt__next_8cpp-source.html b/trunk/paradiseo-mo/doc/html/part__two__opt__next_8cpp-source.html new file mode 100644 index 000000000..e3558b09d --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/part__two__opt__next_8cpp-source.html @@ -0,0 +1,62 @@ + + +ParadisEO-MOMovingObjects: part_two_opt_next.cpp Source File + + + + +
+ +
+

part_two_opt_next.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "part_two_opt_next.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include "part_two_opt_next.h"
+00013 #include "graph.h"
+00014 
+00015 bool TwoOptNext :: operator () (TwoOpt & __move, const Route & __route) 
+00016 {
+00017   if (__move.first == Graph :: size () - 4 && __move.second == __move.first + 2)
+00018     {
+00019       return false ;
+00020     }
+00021   else 
+00022     {
+00023       __move.second ++ ;
+00024       if (__move.second == Graph :: size () - 1) 
+00025         {
+00026           __move.first ++ ;
+00027           __move.second = __move.first + 2 ;
+00028         }
+00029       
+00030       return true ;
+00031     }
+00032 }
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/part__two__opt__next_8h-source.html b/trunk/paradiseo-mo/doc/html/part__two__opt__next_8h-source.html new file mode 100644 index 000000000..692ffc60e --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/part__two__opt__next_8h-source.html @@ -0,0 +1,57 @@ + + +ParadisEO-MOMovingObjects: part_two_opt_next.h Source File + + + + +
+ +
+

part_two_opt_next.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "part_two_opt_next.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef part_two_opt_next_h
+00013 #define part_two_opt_next_h
+00014 
+00015 #include <moNextMove.h>
+00016 #include "two_opt.h"
+00017 
+00019 class PartTwoOptNext : public moNextMove <TwoOpt> 
+00020 {
+00021   
+00022 public :
+00023   
+00024   bool operator () (TwoOpt & __move, const Route & __route) ;
+00025   
+00026 } ;
+00027 
+00028 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8cpp-source.html b/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8cpp-source.html new file mode 100644 index 000000000..3221f3eea --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8cpp-source.html @@ -0,0 +1,123 @@ + + +ParadisEO-MOMovingObjects: partial_mapped_xover.cpp Source File + + + + +
+ +
+

partial_mapped_xover.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "partial_mapped_xover.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* TEXT LICENCE
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include <assert.h>
+00013 
+00014 #include <vector>
+00015 
+00016 #include <utils/eoRNG.h>
+00017 
+00018 #include "partial_mapped_xover.h"
+00019 #include "route_valid.h"
+00020 #include "mix.h"
+00021 
+00022 void PartialMappedXover :: repair (Route & __route, unsigned __cut1, unsigned __cut2) 
+00023 {
+00024   
+00025   std::vector<unsigned int> v; // Number of times a cities are visited ...
+00026   
+00027   v.resize(__route.size ()); 
+00028   
+00029   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00030     {
+00031       v [i] = 0 ;
+00032     }
+00033   
+00034   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00035     {
+00036       v [__route [i]] ++ ;
+00037     }
+00038   
+00039   std :: vector <unsigned int> vert ;
+00040 
+00041   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00042     {
+00043       if (! v [i])
+00044         {
+00045           vert.push_back (i) ;
+00046         }
+00047     }
+00048   
+00049   mix (vert) ;
+00050 
+00051   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00052     {
+00053       if (i < __cut1 || i >= __cut2)
+00054         {
+00055           if (v [__route [i]] > 1) 
+00056             {
+00057               __route [i] = vert.back () ;
+00058               vert.pop_back () ;
+00059             }
+00060         }
+00061    }
+00062 
+00063   v.clear();
+00064 }
+00065 
+00066 bool PartialMappedXover :: operator () (Route & __route1, Route & __route2) 
+00067 {
+00068   unsigned int cut1 = rng.random (__route1.size ()), cut2 = rng.random (__route2.size ()) ;
+00069   
+00070   if (cut2 < cut1)
+00071     {
+00072       std :: swap (cut1, cut2) ;
+00073     }
+00074   
+00075   // Between the cuts
+00076   for (unsigned int i = cut1 ; i < cut2 ; i ++)
+00077     {
+00078       std :: swap (__route1 [i], __route2 [i]) ;
+00079     }
+00080   
+00081   // Outside the cuts
+00082   repair (__route1, cut1, cut2) ;
+00083   repair (__route2, cut1, cut2) ;
+00084   
+00085   // Debug
+00086   assert (valid (__route1)) ;
+00087   assert (valid (__route2)) ;
+00088 
+00089   __route1.invalidate () ;
+00090   __route2.invalidate () ;
+00091 
+00092   return true ;
+00093 }
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8h-source.html b/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8h-source.html new file mode 100644 index 000000000..33272c028 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8h-source.html @@ -0,0 +1,60 @@ + + +ParadisEO-MOMovingObjects: partial_mapped_xover.h Source File + + + + +
+ +
+

partial_mapped_xover.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "partial_mapped_xover.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef partial_mapped_xover_h
+00013 #define partial_mapped_xover_h
+00014 
+00015 #include <eoOp.h>
+00016 
+00017 #include "route.h"
+00018 
+00020 class PartialMappedXover : public eoQuadOp <Route> {
+00021   
+00022 public :
+00023   
+00024   bool operator () (Route & __route1, Route & __route2) ;
+00025 
+00026 private :
+00027   
+00028   void repair (Route & __route, unsigned __cut1, unsigned __cut2) ;
+00029 } ;
+00030 
+00031 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/route_8h-source.html b/trunk/paradiseo-mo/doc/html/route_8h-source.html new file mode 100644 index 000000000..2015e6156 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/route_8h-source.html @@ -0,0 +1,49 @@ + + +ParadisEO-MOMovingObjects: route.h Source File + + + + +
+ +
+

route.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "route.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT 
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef route_h
+00013 #define route_h
+00014 
+00015 #include <eoVector.h>
+00016 
+00017 typedef eoVector <float, unsigned int> Route ; // [Fitness (- length), Gene (city)]
+00018 
+00019 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/route__eval_8cpp-source.html b/trunk/paradiseo-mo/doc/html/route__eval_8cpp-source.html new file mode 100644 index 000000000..8d5c3d32b --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/route__eval_8cpp-source.html @@ -0,0 +1,56 @@ + + +ParadisEO-MOMovingObjects: route_eval.cpp Source File + + + + +
+ +
+

route_eval.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "route_eval.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* TEXT LICENCE
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include "route_eval.h"
+00013 #include "graph.h"
+00014 
+00015 void RouteEval :: operator () (Route & __route) 
+00016 {
+00017   
+00018   float len = 0 ;
+00019   
+00020   for (unsigned int i = 0 ; i < Graph :: size () ; i ++)
+00021     {
+00022       len -= Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ; 
+00023     }
+00024   
+00025   __route.fitness (len) ;
+00026 }
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/route__eval_8h-source.html b/trunk/paradiseo-mo/doc/html/route__eval_8h-source.html new file mode 100644 index 000000000..f3dd3d37e --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/route__eval_8h-source.html @@ -0,0 +1,59 @@ + + +ParadisEO-MOMovingObjects: route_eval.h Source File + + + + +
+ +
+

route_eval.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "route_eval.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef route_eval_h
+00013 #define route_eval_h
+00014 
+00015 #include <eoEvalFunc.h>
+00016 
+00017 #include "route.h"
+00018 
+00020 class RouteEval : public eoEvalFunc <Route> 
+00021 {
+00022   
+00023 public :
+00024   
+00025   void operator () (Route & __route) ;
+00026   
+00027 } ;
+00028 
+00029 
+00030 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/route__init_8cpp-source.html b/trunk/paradiseo-mo/doc/html/route__init_8cpp-source.html new file mode 100644 index 000000000..d126cb436 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/route__init_8cpp-source.html @@ -0,0 +1,68 @@ + + +ParadisEO-MOMovingObjects: route_init.cpp Source File + + + + +
+ +
+

route_init.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "route_init.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include <utils/eoRNG.h>
+00013 
+00014 #include "route_init.h"
+00015 #include "graph.h"
+00016 
+00017 void RouteInit :: operator () (Route & __route) 
+00018 {
+00019   
+00020   // Init.
+00021   __route.clear () ;
+00022   for (unsigned int i = 0 ; i < Graph :: size () ; i ++)
+00023     {
+00024       __route.push_back (i) ;
+00025     }
+00026   
+00027   // Swap. cities
+00028 
+00029   for (unsigned int i = 0 ; i < Graph :: size () ; i ++) 
+00030     {
+00031       //unsigned int j = rng.random (Graph :: size ()) ;
+00032       
+00033       unsigned int j = (unsigned int) (Graph :: size () * (rand () / (RAND_MAX + 1.0))) ;
+00034       unsigned int city = __route [i] ;
+00035       __route [i] = __route [j] ;
+00036       __route [j] = city ;
+00037     }   
+00038 }
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/route__init_8h-source.html b/trunk/paradiseo-mo/doc/html/route__init_8h-source.html new file mode 100644 index 000000000..c8d6295e7 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/route__init_8h-source.html @@ -0,0 +1,58 @@ + + +ParadisEO-MOMovingObjects: route_init.h Source File + + + + +
+ +
+

route_init.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "route_init.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2002-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef route_init_h
+00013 #define route_init_h
+00014 
+00015 #include <eoInit.h>
+00016 
+00017 #include "route.h"
+00018 
+00019 class RouteInit : public eoInit <Route> 
+00020 {
+00021   
+00022 public :
+00023   
+00024   void operator () (Route & __route) ;
+00025   
+00026 } ;
+00027 
+00028 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/route__valid_8cpp-source.html b/trunk/paradiseo-mo/doc/html/route__valid_8cpp-source.html new file mode 100644 index 000000000..3b4e6f3af --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/route__valid_8cpp-source.html @@ -0,0 +1,73 @@ + + +ParadisEO-MOMovingObjects: route_valid.cpp Source File + + + + +
+ +
+

route_valid.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "route_valid.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include "route_valid.h"
+00013 
+00014 #include <vector>
+00015 
+00016 bool valid (Route & __route) 
+00017 {
+00018   
+00019   std::vector<unsigned int> t;
+00020   t.resize(__route.size());
+00021   
+00022   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00023     {
+00024       t [i] = 0 ;
+00025     }
+00026   
+00027   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00028     {
+00029       t [__route [i]] ++ ;
+00030     }
+00031   
+00032   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00033     {
+00034       if (t [i] != 1)
+00035         {
+00036           t.clear();
+00037           return false ;
+00038         }
+00039     }
+00040   
+00041   t.clear();
+00042   return true ; // OK.
+00043 }
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/route__valid_8h-source.html b/trunk/paradiseo-mo/doc/html/route__valid_8h-source.html new file mode 100644 index 000000000..dd62cd522 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/route__valid_8h-source.html @@ -0,0 +1,49 @@ + + +ParadisEO-MOMovingObjects: route_valid.h Source File + + + + +
+ +
+

route_valid.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "route_valid.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef route_valid_h
+00013 #define route_valid_h
+00014 
+00015 #include "route.h"
+00016 
+00017 bool valid (Route & __route) ;
+00018 
+00019 #endif
+
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/search.idx b/trunk/paradiseo-mo/doc/html/search.idx index f5121b3f3b1701988b89ea6e662035e062d5ca22..87366ea0dcec66f34a8d212f667b963ede3eca0b 100644 GIT binary patch literal 384510 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 SMbg?BG$54XvP`G!K&e)#- diff --git a/trunk/paradiseo-mo/doc/html/search.php b/trunk/paradiseo-mo/doc/html/search.php index 20bf8b6aa..76ff67784 100644 --- a/trunk/paradiseo-mo/doc/html/search.php +++ b/trunk/paradiseo-mo/doc/html/search.php @@ -8,6 +8,7 @@
  • Main Page
    • +
  • Namespaces
  • Classes
  • Files
  • @@ -374,7 +375,7 @@ main(); ?> -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/simulated__annealing_8cpp-source.html b/trunk/paradiseo-mo/doc/html/simulated__annealing_8cpp-source.html new file mode 100644 index 000000000..bd4af5727 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/simulated__annealing_8cpp-source.html @@ -0,0 +1,97 @@ + + +ParadisEO-MOMovingObjects: simulated_annealing.cpp Source File + + + + +
    + +
    +

    simulated_annealing.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "simulated_annealing.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008 
+00009    Contact:  paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include <mo.h>
+00013 
+00014 #include <graph.h>
+00015 #include <route.h>
+00016 #include <route_eval.h>
+00017 #include <route_init.h>
+00018 
+00019 #include <two_opt.h>
+00020 #include <two_opt_rand.h>
+00021 #include <two_opt_incr_eval.h>
+00022 
+00023 int
+00024 main (int __argc, char * __argv []) 
+00025 {
+00026   if (__argc != 2) 
+00027     {
+00028       std :: cerr << "Usage : ./simulated_annealing [instance]" << std :: endl ;
+00029       return 1 ;
+00030     }
+00031   
+00032   Graph :: load (__argv [1]) ; // Instance
+00033 
+00034   Route route ; // Solution
+00035   
+00036   RouteInit init ; // Sol. Random Init.
+00037   init (route) ;
+00038 
+00039   RouteEval full_eval ; // Full. Eval.
+00040   full_eval (route) ;
+00041   
+00042   std :: cout << "[From] " << route << std :: endl ;
+00043   
+00044   /* Tools for an efficient (? :-))
+00045      local search ! */
+00046   
+00047   TwoOptRand two_opt_rand ; // Route Random. Gen.
+00048      
+00049   TwoOptIncrEval two_opt_incr_eval ; // Eff. eval.
+00050   
+00051   TwoOpt move ;
+00052   
+00053   moExponentialCoolingSchedule cool_sched (0.1, 0.98) ; // Exponential Cooling Schedule 
+00054   //moLinearCoolingSchedule cool_sched (0.1, 0.5) ; // Linear Cooling Schedule 
+00055   
+00056   moGenSolContinue <Route> cont (1000) ; /* Temperature Descreasing
+00057                                             will occur each 1000
+00058                                             iterations */ 
+00059   
+00060   moSA <TwoOpt> simulated_annealing (two_opt_rand, two_opt_incr_eval, cont, 1000, cool_sched, full_eval) ;
+00061   simulated_annealing (route) ;
+00062 
+00063   std :: cout << "[To] " << route << std :: endl ;
+00064   
+00065   return 0 ;
+00066 }
+00067 
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/t-mo_8cpp-source.html b/trunk/paradiseo-mo/doc/html/t-mo_8cpp-source.html new file mode 100644 index 000000000..88d184923 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/t-mo_8cpp-source.html @@ -0,0 +1,54 @@ + + +ParadisEO-MOMovingObjects: t-mo.cpp Source File + + + + +
    + +
    +

    t-mo.cpp

    00001 //-----------------------------------------------------------------------------
+00002 // t-mo.cpp
+00003 //-----------------------------------------------------------------------------
+00004 
+00005 #include <eo>  // EO
+00006 #include <mo.h>  // MO
+00007 
+00008 //-----------------------------------------------------------------------------
+00009 
+00010 typedef EO<float> Chrom;
+00011 
+00012 //-----------------------------------------------------------------------------
+00013 
+00014 int main()
+00015 {
+00016   Chrom chrom1, chrom2;
+00017 
+00018   std::cout << "chrom1 = " << chrom1 << std::endl
+00019        << "chrom2 = " << chrom2 << std::endl;
+00020 
+00021   return 0;
+00022 }
+00023 
+00024 //-----------------------------------------------------------------------------
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/tabu__search_8cpp-source.html b/trunk/paradiseo-mo/doc/html/tabu__search_8cpp-source.html new file mode 100644 index 000000000..f1d953448 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/tabu__search_8cpp-source.html @@ -0,0 +1,100 @@ + + +ParadisEO-MOMovingObjects: tabu_search.cpp Source File + + + + +
    + +
    +

    tabu_search.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "tabu_search.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include <mo.h>
+00013 
+00014 #include <graph.h>
+00015 #include <route.h>
+00016 #include <route_eval.h>
+00017 #include <route_init.h>
+00018 
+00019 #include <two_opt.h>
+00020 #include <two_opt_init.h>
+00021 #include <two_opt_next.h>
+00022 #include <two_opt_incr_eval.h>
+00023 #include <two_opt_tabu_list.h>
+00024 
+00025 int
+00026 main (int __argc, char * __argv []) 
+00027 {
+00028   if (__argc != 2) 
+00029     {
+00030       std :: cerr << "Usage : ./tabu_search [instance]" << std :: endl ;
+00031       return 1 ;
+00032     }
+00033   
+00034   Graph :: load (__argv [1]) ; // Instance
+00035   
+00036   Route route ; // Solution
+00037   
+00038   RouteInit init ; // Sol. Random Init.
+00039   init (route) ;
+00040   
+00041   RouteEval full_eval ; // Full. Eval.
+00042   full_eval (route) ;
+00043   
+00044   std :: cout << "[From] " << route << std :: endl ;
+00045 
+00046   /* Tools for an efficient (? :-))
+00047      local search ! */
+00048   
+00049   TwoOptInit two_opt_init ; // Init.
+00050    
+00051   TwoOptNext two_opt_next ; // Explorer.
+00052   
+00053   TwoOptIncrEval two_opt_incr_eval ; // Eff. eval.
+00054 
+00055   TwoOptTabuList tabu_list ; // Tabu List
+00056   //moSimpleMoveTabuList<TwoOpt> tabu_list(10);
+00057   //moSimpleSolutionTabuList<TwoOpt> tabu_list(10);
+00058 
+00059   moNoAspirCrit <TwoOpt> aspir_crit ; // Aspiration Criterion
+00060 
+00061   moGenSolContinue <Route> cont (10000) ; // Continuator
+00062 
+00063   moTS <TwoOpt> tabu_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, cont, full_eval) ;
+00064   tabu_search (route) ;
+00065   
+00066   std :: cout << "[To] " << route << std :: endl ;
+00067   
+00068   return 0 ;
+00069 }
+00070 
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/tree.html b/trunk/paradiseo-mo/doc/html/tree.html index 14d9c2e8e..cbf5c7d4f 100644 --- a/trunk/paradiseo-mo/doc/html/tree.html +++ b/trunk/paradiseo-mo/doc/html/tree.html @@ -61,21 +61,27 @@
    -

    PARADISEO-MO

    +

    ParadisEO-MOMovingObjects

    o*Welcome to PARADISEO-Moving Objects

    o+Class List

    o+Class Hierarchy

    +

    |o*CitySwap

    +

    |o*EdgeXover

    |o*EmptySelection

    -

    |o+eoFunctorBase [external]

    +

    |o*moAlgo< EOT >

    +

    |o+moAlgo< M::EOType >

    -

    ||o+eoBF< const M &, const M::EOType &, bool > [external]

    - -

    ||o+eoBF< const M &, const M::EOType &, M::EOType::Fitness > [external]

    - -

    ||o+eoBF< const M &, const M::EOType &, void > [external]

    - -

    ||o+eoBF< const M &, const M::EOType::Fitness &, bool > [external]

    - -

    ||o+eoBF< const M::EOType &, M::EOType &, void > [external]

    - -

    ||o+eoBF< M &, const M::EOType &, bool > [external]

    - -

    ||o+eoBF< M &, const M::EOType &, void > [external]

    - -

    ||o+eoBF< M &, M::EOType::Fitness &, void > [external]

    - -

    ||o+eoUF< const EOT &, bool > [external]

    - -

    ||o+eoUF< double &, bool > [external]

    - -

    ||o+eoUF< EOT &, bool > [external]

    -
    -

    |||\+eoMonOp< EOT > [external]

    - -
    -

    ||o+eoUF< EOT &, void > [external]

    - -

    ||o*eoUF< EOType &, bool > [external]

    -

    ||o+eoUF< M &, void > [external]

    - -

    ||\+eoUF< M::EOType &, bool > [external]

    - +

    |o+moAspirCrit< M >

    + +

    |o+moComparator< EOT >

    + +

    |o+moCoolingSchedule

    + +

    |o*moLSCheckPoint< M >

    +

    |o*moMove< EOT >

    +

    |o+moMove< Route >

    +
    +

    ||\*TwoOpt

    +
    +

    |o+moMoveExpl< M >

    + -

    |\+eoOp< EOType > [external]

    -

    o*Class Members

    -

    \+File List

    -
    +

    o+Namespace List

    +
    +

    |\*Graph

    +
    +

    o*Namespace Members

    +

    \+File List

    +
    +

     o*city_swap.cpp

    +

     o*city_swap.h

    +

     o*edge_xover.cpp

    +

     o*edge_xover.h

    +

     o*graph.cpp

    +

     o*graph.h

    +

     o*hill_climbing.cpp

     o*index.h

    +

     o*iterated_local_search.cpp

    +

     o*mix.h

     o*mo.h

     o*moAlgo.h

     o*moAspirCrit.h

     o*moBestImprSelect.h

    +

     o*moComparator.h

     o*moCoolingSchedule.h

     o*moExponentialCoolingSchedule.h

     o*moFirstImprSelect.h

    +

     o*moFitComparator.h

    +

     o*moFitSolContinue.h

     o*moGenSolContinue.h

     o*moHC.h

     o*moHCMoveLoopExpl.h

    +

     o*moILS.h

     o*moImprBestFitAspirCrit.h

     o*moItRandNextMove.h

     o*moLinearCoolingSchedule.h

    @@ -234,15 +257,49 @@

     o*moMoveSelect.h

     o*moNextMove.h

     o*moNoAspirCrit.h

    +

     o*moNoFitImprSolContinue.h

     o*moRandImprSelect.h

     o*moRandMove.h

     o*moSA.h

     o*moSimpleMoveTabuList.h

     o*moSimpleSolutionTabuList.h

     o*moSolContinue.h

    +

     o*moSteadyFitSolContinue.h

     o*moTabuList.h

     o*moTS.h

    -

     \*moTSMoveLoopExpl.h

    +

     o*moTSMoveLoopExpl.h

    +

     o*order_xover.cpp

    +

     o*order_xover.h

    +

     o*part_route_eval.cpp

    +

     o*part_route_eval.h

    +

     o*part_two_opt_init.cpp

    +

     o*part_two_opt_init.h

    +

     o*part_two_opt_next.cpp

    +

     o*part_two_opt_next.h

    +

     o*partial_mapped_xover.cpp

    +

     o*partial_mapped_xover.h

    +

     o*route.h

    +

     o*route_eval.cpp

    +

     o*route_eval.h

    +

     o*route_init.cpp

    +

     o*route_init.h

    +

     o*route_valid.cpp

    +

     o*route_valid.h

    +

     o*simulated_annealing.cpp

    +

     o*t-mo.cpp

    +

     o*tabu_search.cpp

    +

     o*two_opt.cpp

    +

     o*two_opt.h

    +

     o*two_opt_incr_eval.cpp

    +

     o*two_opt_incr_eval.h

    +

     o*two_opt_init.cpp

    +

     o*two_opt_init.h

    +

     o*two_opt_next.cpp

    +

     o*two_opt_next.h

    +

     o*two_opt_rand.cpp

    +

     o*two_opt_rand.h

    +

     o*two_opt_tabu_list.cpp

    +

     \*two_opt_tabu_list.h

    diff --git a/trunk/paradiseo-mo/doc/html/two__opt_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt_8cpp-source.html new file mode 100644 index 000000000..c9640f156 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt_8cpp-source.html @@ -0,0 +1,77 @@ + + +ParadisEO-MOMovingObjects: two_opt.cpp Source File + + + + +
    + +
    +

    two_opt.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "two_opt.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include "two_opt.h"
+00013 
+00014 TwoOpt TwoOpt :: operator ! () const 
+00015 {
+00016   TwoOpt move = * this ;
+00017   std :: swap (move.first, move.second) ;
+00018   
+00019   return move ;
+00020 }
+00021 
+00022 void TwoOpt :: operator () (Route & __route) 
+00023 {
+00024   
+00025   std :: vector <unsigned int> seq_cities ;
+00026   
+00027   for (unsigned int i = second ; i > first ; i --)
+00028     {
+00029       seq_cities.push_back (__route [i]) ;
+00030     }
+00031   
+00032   unsigned int j = 0 ;
+00033   for (unsigned int i = first + 1 ; i < second + 1 ; i ++)
+00034     {
+00035       __route [i] = seq_cities [j ++] ;
+00036     }
+00037 }
+00038 
+00039 void TwoOpt :: readFrom (std :: istream & __is) 
+00040 {
+00041   __is >> first >> second ;
+00042 }
+00043 
+00044 void TwoOpt :: printOn (std :: ostream & __os) const 
+00045 {
+00046   __os << first << ' ' << second ;
+00047 }
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/two__opt_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt_8h-source.html new file mode 100644 index 000000000..b5796eb7f --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt_8h-source.html @@ -0,0 +1,66 @@ + + +ParadisEO-MOMovingObjects: two_opt.h Source File + + + + +
    + +
    +

    two_opt.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "two_opt.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef two_opt_h
+00013 #define two_opt_h
+00014 
+00015 #include <eoPersistent.h>
+00016 
+00017 #include <utility>
+00018 #include <moMove.h>
+00019 
+00020 #include "route.h"
+00021 
+00022 class TwoOpt : public moMove <Route>, public std :: pair <unsigned, unsigned>, public eoPersistent 
+00023 {
+00024   
+00025 public :
+00026   
+00027   TwoOpt operator ! () const ;
+00028   
+00029   void operator () (Route & __route) ;
+00030   
+00031   void readFrom (std :: istream & __is) ;
+00032   
+00033   void printOn (std :: ostream & __os) const ;
+00034 } ;
+00035 
+00036 #endif
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8cpp-source.html new file mode 100644 index 000000000..7f88d424a --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8cpp-source.html @@ -0,0 +1,58 @@ + + +ParadisEO-MOMovingObjects: two_opt_incr_eval.cpp Source File + + + + +
    + +
    +

    two_opt_incr_eval.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "TwoOptIncrEval.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include "two_opt_incr_eval.h"
+00013 #include "graph.h"
+00014 
+00015 float TwoOptIncrEval :: operator () (const TwoOpt & __move, const Route & __route) 
+00016 {
+00017   // From
+00018   unsigned int v1 = __route [__move.first], v1_next = __route [__move.first + 1] ;
+00019   
+00020   // To
+00021   unsigned int v2 = __route [__move.second], v2_next = __route [__move.second + 1] ;
+00022   
+00023   return __route.fitness ()
+00024     - Graph :: distance (v1, v2)
+00025     - Graph :: distance (v1_next, v2_next)
+00026     + Graph :: distance (v1, v1_next)
+00027     + Graph :: distance (v2, v2_next)  ;
+00028 }
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8h-source.html new file mode 100644 index 000000000..000b6e9c9 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8h-source.html @@ -0,0 +1,57 @@ + + +ParadisEO-MOMovingObjects: two_opt_incr_eval.h Source File + + + + +
    + +
    +

    two_opt_incr_eval.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "TwoOptIncrEval.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef two_optincr_eval_h
+00013 #define two_optincr_eval_h
+00014 
+00015 #include <moMoveIncrEval.h>
+00016 #include "two_opt.h"
+00017 
+00018 class TwoOptIncrEval : public moMoveIncrEval <TwoOpt> 
+00019 {
+00020   
+00021 public :
+00022   
+00023   float operator () (const TwoOpt & __move, const Route & __route) ; 
+00024 
+00025 } ;
+00026 
+00027 #endif
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/two__opt__init_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt__init_8cpp-source.html new file mode 100644 index 000000000..efa6a8be9 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt__init_8cpp-source.html @@ -0,0 +1,48 @@ + + +ParadisEO-MOMovingObjects: two_opt_init.cpp Source File + + + + +
    + +
    +

    two_opt_init.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "two_opt_init.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include "two_opt_init.h"
+00013 
+00014 void TwoOptInit :: operator () (TwoOpt & __move, const Route & __route) 
+00015 {
+00016   __move.first = 0 ;
+00017   __move.second = 2 ;
+00018 }
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/two__opt__init_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt__init_8h-source.html new file mode 100644 index 000000000..7399aa11a --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt__init_8h-source.html @@ -0,0 +1,58 @@ + + +ParadisEO-MOMovingObjects: two_opt_init.h Source File + + + + +
    + +
    +

    two_opt_init.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "two_opt_init.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef two_opt_init_h
+00013 #define two_opt_init_h
+00014 
+00015 #include <moMoveInit.h>
+00016 
+00017 #include "two_opt.h"
+00018 
+00020 class TwoOptInit : public moMoveInit <TwoOpt> 
+00021 {
+00022   
+00023 public :
+00024   
+00025   void operator () (TwoOpt & __move, const Route & __route) ;
+00026   
+00027 } ;
+00028 
+00029 #endif
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/two__opt__next_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt__next_8cpp-source.html new file mode 100644 index 000000000..eb7576154 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt__next_8cpp-source.html @@ -0,0 +1,62 @@ + + +ParadisEO-MOMovingObjects: two_opt_next.cpp Source File + + + + +
    + +
    +

    two_opt_next.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "two_opt_next.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include "two_opt_next.h"
+00013 #include "graph.h"
+00014 
+00015 bool TwoOptNext :: operator () (TwoOpt & __move, const Route & __route) 
+00016 {
+00017   if (__move.first == Graph :: size () - 4 && __move.second == __move.first + 2)
+00018     {
+00019       return false ;
+00020     }
+00021   else 
+00022     {
+00023       __move.second ++ ;
+00024       if (__move.second == Graph :: size () - 1) 
+00025         {
+00026           __move.first ++ ;
+00027           __move.second = __move.first + 2 ;
+00028         }
+00029       
+00030       return true ;
+00031     }
+00032 }
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/two__opt__next_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt__next_8h-source.html new file mode 100644 index 000000000..4bc1d19c0 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt__next_8h-source.html @@ -0,0 +1,57 @@ + + +ParadisEO-MOMovingObjects: two_opt_next.h Source File + + + + +
    + +
    +

    two_opt_next.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "two_opt_next.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef two_opt_next_h
+00013 #define two_opt_next_h
+00014 
+00015 #include <moNextMove.h>
+00016 #include "two_opt.h"
+00017 
+00019 class TwoOptNext : public moNextMove <TwoOpt> 
+00020 {
+00021   
+00022 public :
+00023   
+00024   bool operator () (TwoOpt & __move, const Route & __route) ;
+00025   
+00026 } ;
+00027 
+00028 #endif
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/two__opt__rand_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt__rand_8cpp-source.html new file mode 100644 index 000000000..9cdf40e44 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt__rand_8cpp-source.html @@ -0,0 +1,50 @@ + + +ParadisEO-MOMovingObjects: two_opt_rand.cpp Source File + + + + +
    + +
    +

    two_opt_rand.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "two_opt_rand.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include "two_opt_rand.h"
+00013 #include "graph.h"
+00014 #include <utils/eoRNG.h>
+00015 
+00016 void TwoOptRand :: operator () (TwoOpt & __move) 
+00017 {
+00018   __move.first = rng.random (Graph :: size () - 3) ;
+00019   __move.second = __move.first + 2 + rng.random (Graph :: size () - __move.first - 3) ;
+00020 }
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/two__opt__rand_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt__rand_8h-source.html new file mode 100644 index 000000000..b517b7d8b --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt__rand_8h-source.html @@ -0,0 +1,58 @@ + + +ParadisEO-MOMovingObjects: two_opt_rand.h Source File + + + + +
    + +
    +

    two_opt_rand.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "two_opt_rand.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef two_opt_rand_h
+00013 #define two_opt_rand_h
+00014 
+00015 #include <moRandMove.h>
+00016 
+00017 #include "two_opt.h"
+00018 
+00019 class TwoOptRand : public moRandMove <TwoOpt> 
+00020 {
+00021   
+00022 public :
+00023   
+00024   void operator () (TwoOpt & __move) ;
+00025   
+00026 } ;
+00027 
+00028 #endif
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8cpp-source.html new file mode 100644 index 000000000..a78d1e67c --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8cpp-source.html @@ -0,0 +1,88 @@ + + +ParadisEO-MOMovingObjects: two_opt_tabu_list.cpp Source File + + + + +
    + +
    +

    two_opt_tabu_list.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "two_opt_tabu_list.cpp"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #include "two_opt_tabu_list.h"
+00013 #include "graph.h"
+00014 
+00015 #define TABU_LENGTH 10
+00016 
+00017 void TwoOptTabuList :: init () 
+00018 {
+00019   // Size (eventually)
+00020   tabu_span.resize (Graph :: size ()) ;
+00021   for (unsigned int i = 0 ; i < tabu_span.size () ; i ++)
+00022     {
+00023       tabu_span [i].resize (Graph :: size ()) ;  
+00024     }
+00025 
+00026   // Clear
+00027   for (unsigned int i = 0 ; i < tabu_span.size () ; i ++)
+00028     {
+00029       for (unsigned int j = 0 ; j < tabu_span [i].size () ; j ++)
+00030         {
+00031           tabu_span [i] [j] = 0 ;
+00032         }
+00033     }
+00034 }
+00035 
+00036 bool TwoOptTabuList :: operator () (const TwoOpt & __move, const Route & __sol) 
+00037 {
+00038   return tabu_span [__move.first] [__move.second] > 0 ;
+00039 }
+00040 
+00041 void TwoOptTabuList :: add (const TwoOpt & __move, const Route & __sol) 
+00042 {
+00043   tabu_span [__move.first] [__move.second] = tabu_span [__move.second] [__move.first] = TABU_LENGTH ;
+00044 }
+00045 
+00046 void TwoOptTabuList :: update () 
+00047 {
+00048   for (unsigned int i = 0 ; i < tabu_span.size () ; i ++)
+00049     {
+00050       for (unsigned int j = 0 ; j < tabu_span [i].size () ; j ++)
+00051         {
+00052           if (tabu_span [i] [j] > 0)
+00053             {
+00054               tabu_span [i] [j] -- ;
+00055             }
+00056         }
+00057     }
+00058 }
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8h-source.html new file mode 100644 index 000000000..85bd91b23 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8h-source.html @@ -0,0 +1,67 @@ + + +ParadisEO-MOMovingObjects: two_opt_tabu_list.h Source File + + + + +
    + +
    +

    two_opt_tabu_list.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "two_opt_tabu_list.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2006
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef two_opt_tabu_list_h
+00013 #define two_opt_tabu_list_h
+00014 
+00015 #include <moTabuList.h>
+00016 #include "two_opt.h"
+00017 #include "route.h"
+00018 
+00020 class TwoOptTabuList : public moTabuList <TwoOpt> 
+00021 {
+00022 public :
+00023   
+00024   bool operator () (const TwoOpt & __move, const Route & __sol) ;
+00025   
+00026   void add (const TwoOpt & __move, const Route & __sol) ;
+00027   
+00028   void update () ;
+00029   
+00030   void init () ;
+00031   
+00032 private :
+00033   
+00034   std :: vector <std :: vector <unsigned> > tabu_span ;
+00035   
+00036 } ;
+00037 
+00038 #endif
+
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/latex/annotated.tex b/trunk/paradiseo-mo/doc/latex/annotated.tex index d9ae06077..b48188e7b 100644 --- a/trunk/paradiseo-mo/doc/latex/annotated.tex +++ b/trunk/paradiseo-mo/doc/latex/annotated.tex @@ -1,15 +1,21 @@ -\section{PARADISEO-MO Class List} +\section{ParadisEO-MOMovingObjects Class List} Here are the classes, structs, unions and interfaces with brief descriptions:\begin{CompactList} +\item\contentsline{section}{{\bf CitySwap} (Its swaps two vertices randomly choosen )}{\pageref{class_city_swap}}{} +\item\contentsline{section}{{\bf EdgeXover} (Edge Crossover )}{\pageref{class_edge_xover}}{} \item\contentsline{section}{{\bf EmptySelection} (Special class that describes the case of no selection )}{\pageref{class_empty_selection}}{} \item\contentsline{section}{{\bf moAlgo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{} \item\contentsline{section}{{\bf moAspirCrit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{} \item\contentsline{section}{{\bf moBestImprSelect$<$ M $>$} (One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{} +\item\contentsline{section}{{\bf moComparator$<$ EOT $>$} (Template for classes which need to compare two EOT and indicate if the first is \char`\"{}better\char`\"{} than the second )}{\pageref{classmo_comparator}}{} \item\contentsline{section}{{\bf moCoolingSchedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{} \item\contentsline{section}{{\bf moExponentialCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{} \item\contentsline{section}{{\bf moFirstImprSelect$<$ M $>$} (One possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{} +\item\contentsline{section}{{\bf moFitComparator$<$ EOT $>$} (Comparison according to the fitness )}{\pageref{classmo_fit_comparator}}{} +\item\contentsline{section}{{\bf moFitSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_fit_sol_continue}}{} \item\contentsline{section}{{\bf moGenSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{} \item\contentsline{section}{{\bf moHC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{} \item\contentsline{section}{{\bf moHCMoveLoopExpl$<$ M $>$} (Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{} +\item\contentsline{section}{{\bf moILS$<$ M $>$} (Iterated Local Search (ILS) )}{\pageref{classmo_i_l_s}}{} \item\contentsline{section}{{\bf moImprBestFitAspirCrit$<$ M $>$} (One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{} \item\contentsline{section}{{\bf moItRandNextMove$<$ M $>$} (One of the possible \doxyref{moNextMove}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{} \item\contentsline{section}{{\bf moLinearCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{} @@ -22,13 +28,28 @@ Here are the classes, structs, unions and interfaces with brief descriptions:\be \item\contentsline{section}{{\bf moMoveSelect$<$ M $>$} (Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_move_select}}{} \item\contentsline{section}{{\bf moNextMove$<$ M $>$} (Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_next_move}}{} \item\contentsline{section}{{\bf moNoAspirCrit$<$ M $>$} (One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}) )}{\pageref{classmo_no_aspir_crit}}{} +\item\contentsline{section}{{\bf moNoFitImprSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_no_fit_impr_sol_continue}}{} \item\contentsline{section}{{\bf moRandImprSelect$<$ M $>$} (One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{} \item\contentsline{section}{{\bf moRandMove$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{} \item\contentsline{section}{{\bf moSA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{} \item\contentsline{section}{{\bf moSimpleMoveTabuList$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{} \item\contentsline{section}{{\bf moSimpleSolutionTabuList$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{} \item\contentsline{section}{{\bf moSolContinue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{} +\item\contentsline{section}{{\bf moSteadyFitSolContinue$<$ EOT $>$} (One possible stopping criterion for a solution-based heuristic )}{\pageref{classmo_steady_fit_sol_continue}}{} \item\contentsline{section}{{\bf moTabuList$<$ M $>$} (Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{} \item\contentsline{section}{{\bf moTS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{} \item\contentsline{section}{{\bf moTSMoveLoopExpl$<$ M $>$} (Explorer for a Tabu Search algorithm )}{\pageref{classmo_t_s_move_loop_expl}}{} +\item\contentsline{section}{{\bf OrderXover} (Order Crossover )}{\pageref{class_order_xover}}{} +\item\contentsline{section}{{\bf PartialMappedXover} (Partial Mapped Crossover )}{\pageref{class_partial_mapped_xover}}{} +\item\contentsline{section}{{\bf PartRouteEval} (Route Evaluator )}{\pageref{class_part_route_eval}}{} +\item\contentsline{section}{{\bf PartTwoOptInit} (It sets the first couple of edges )}{\pageref{class_part_two_opt_init}}{} +\item\contentsline{section}{{\bf PartTwoOptNext} (It updates a couple of edges )}{\pageref{class_part_two_opt_next}}{} +\item\contentsline{section}{{\bf RouteEval} (Route Evaluator )}{\pageref{class_route_eval}}{} +\item\contentsline{section}{{\bf RouteInit} }{\pageref{class_route_init}}{} +\item\contentsline{section}{{\bf TwoOpt} }{\pageref{class_two_opt}}{} +\item\contentsline{section}{{\bf TwoOptIncrEval} }{\pageref{class_two_opt_incr_eval}}{} +\item\contentsline{section}{{\bf TwoOptInit} (It sets the first couple of edges )}{\pageref{class_two_opt_init}}{} +\item\contentsline{section}{{\bf TwoOptNext} (It updates a couple of edges )}{\pageref{class_two_opt_next}}{} +\item\contentsline{section}{{\bf TwoOptRand} }{\pageref{class_two_opt_rand}}{} +\item\contentsline{section}{{\bf TwoOptTabuList} (The table of tabu movements, i.e )}{\pageref{class_two_opt_tabu_list}}{} \end{CompactList} diff --git a/trunk/paradiseo-mo/doc/latex/class_city_swap.tex b/trunk/paradiseo-mo/doc/latex/class_city_swap.tex new file mode 100644 index 000000000..55809249f --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_city_swap.tex @@ -0,0 +1,26 @@ +\section{CitySwap Class Reference} +\label{class_city_swap}\index{CitySwap@{CitySwap}} +Its swaps two vertices randomly choosen. + + +{\tt \#include $<$city\_\-swap.h$>$} + +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +bool {\bf operator()} (Route \&\_\-\_\-route)\label{class_city_swap_7e6958b62048c89604cbf046b86bdf2d} + +\end{CompactItemize} + + +\subsection{Detailed Description} +Its swaps two vertices randomly choosen. + + + +Definition at line 21 of file city\_\-swap.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +city\_\-swap.h\item +city\_\-swap.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_edge_xover.tex b/trunk/paradiseo-mo/doc/latex/class_edge_xover.tex new file mode 100644 index 000000000..a77bd26ea --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_edge_xover.tex @@ -0,0 +1,47 @@ +\section{EdgeXover Class Reference} +\label{class_edge_xover}\index{EdgeXover@{EdgeXover}} +Edge Crossover. + + +{\tt \#include $<$edge\_\-xover.h$>$} + +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +bool {\bf operator()} (Route \&\_\-\_\-route1, Route \&\_\-\_\-route2)\label{class_edge_xover_cb1c0a103106a4d3319540cb23163a79} + +\end{CompactItemize} +\subsection*{Private Member Functions} +\begin{CompactItemize} +\item +void {\bf cross} (const Route \&\_\-\_\-par1, const Route \&\_\-\_\-par2, Route \&\_\-\_\-child)\label{class_edge_xover_88c2d4c9a878454a32d56010f3dddc27} + +\item +void {\bf build\_\-map} (const Route \&\_\-\_\-par1, const Route \&\_\-\_\-par2)\label{class_edge_xover_04de96aa1016836e0ba5f4b952a5fa16} + +\item +void {\bf add\_\-vertex} (unsigned int \_\-\_\-vertex, Route \&\_\-\_\-child)\label{class_edge_xover_b590458c35c16a14896a4bcdf9674ade} + +\end{CompactItemize} +\subsection*{Private Attributes} +\begin{CompactItemize} +\item +std::vector$<$ std::set$<$ unsigned int $>$ $>$ {\bf \_\-map}\label{class_edge_xover_7d9272c12cfa55df4677d5ad837a0e5c} + +\item +std::vector$<$ bool $>$ {\bf visited}\label{class_edge_xover_46d4d4724cf6d660b1a7ab4a346573d4} + +\end{CompactItemize} + + +\subsection{Detailed Description} +Edge Crossover. + + + +Definition at line 23 of file edge\_\-xover.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +edge\_\-xover.h\item +edge\_\-xover.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_order_xover.tex b/trunk/paradiseo-mo/doc/latex/class_order_xover.tex new file mode 100644 index 000000000..c5bf6675e --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_order_xover.tex @@ -0,0 +1,32 @@ +\section{OrderXover Class Reference} +\label{class_order_xover}\index{OrderXover@{OrderXover}} +Order Crossover. + + +{\tt \#include $<$order\_\-xover.h$>$} + +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +bool {\bf operator()} (Route \&\_\-\_\-route1, Route \&\_\-\_\-route2)\label{class_order_xover_0ff6aada669eb8173322ed68cda1ac61} + +\end{CompactItemize} +\subsection*{Private Member Functions} +\begin{CompactItemize} +\item +void {\bf cross} (const Route \&\_\-\_\-par1, const Route \&\_\-\_\-par2, Route \&\_\-\_\-child)\label{class_order_xover_d2bf90b5f46ac4a344777e17bc5f364d} + +\end{CompactItemize} + + +\subsection{Detailed Description} +Order Crossover. + + + +Definition at line 20 of file order\_\-xover.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +order\_\-xover.h\item +order\_\-xover.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_part_route_eval.tex b/trunk/paradiseo-mo/doc/latex/class_part_route_eval.tex new file mode 100644 index 000000000..72520a0c1 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_part_route_eval.tex @@ -0,0 +1,38 @@ +\section{PartRouteEval Class Reference} +\label{class_part_route_eval}\index{PartRouteEval@{PartRouteEval}} +Route Evaluator. + + +{\tt \#include $<$part\_\-route\_\-eval.h$>$} + +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +{\bf PartRouteEval} (float \_\-\_\-from, float \_\-\_\-to)\label{class_part_route_eval_a331566b29bc3227f377004232f05491} + +\begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item +void {\bf operator()} (Route \&\_\-\_\-route)\label{class_part_route_eval_965fab875fb601f17934a6ece761beae} + +\end{CompactItemize} +\subsection*{Private Attributes} +\begin{CompactItemize} +\item +float {\bf from}\label{class_part_route_eval_5bde722e66378b2570ae6c4b4f8df58e} + +\item +float {\bf to}\label{class_part_route_eval_de53cc919faa498663f327b72c357da3} + +\end{CompactItemize} + + +\subsection{Detailed Description} +Route Evaluator. + + + +Definition at line 20 of file part\_\-route\_\-eval.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +part\_\-route\_\-eval.h\item +part\_\-route\_\-eval.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.eps b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.eps new file mode 100644 index 000000000..94a58a350 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 264.901 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 1.8875 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(PartTwoOptInit) cw +(moMoveInit< TwoOpt >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (PartTwoOptInit) 0 0 box + (moMoveInit< TwoOpt >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.tex b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.tex new file mode 100644 index 000000000..181fc844f --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.tex @@ -0,0 +1,32 @@ +\section{PartTwoOptInit Class Reference} +\label{class_part_two_opt_init}\index{PartTwoOptInit@{PartTwoOptInit}} +It sets the first couple of edges. + + +{\tt \#include $<$part\_\-two\_\-opt\_\-init.h$>$} + +Inheritance diagram for PartTwoOptInit::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{class_part_two_opt_init} +\end{center} +\end{figure} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +void {\bf operator()} ({\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-route)\label{class_part_two_opt_init_2f6190b1700ca1a12d0baaceaf75383c} + +\end{CompactItemize} + + +\subsection{Detailed Description} +It sets the first couple of edges. + + + +Definition at line 20 of file part\_\-two\_\-opt\_\-init.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +part\_\-two\_\-opt\_\-init.h\item +part\_\-two\_\-opt\_\-init.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.eps b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.eps new file mode 100644 index 000000000..f304c959b --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 250 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 2 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(PartTwoOptNext) cw +(moNextMove< TwoOpt >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (PartTwoOptNext) 0 0 box + (moNextMove< TwoOpt >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.tex b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.tex new file mode 100644 index 000000000..f91fb95c3 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.tex @@ -0,0 +1,25 @@ +\section{PartTwoOptNext Class Reference} +\label{class_part_two_opt_next}\index{PartTwoOptNext@{PartTwoOptNext}} +It updates a couple of edges. + + +{\tt \#include $<$part\_\-two\_\-opt\_\-next.h$>$} + +Inheritance diagram for PartTwoOptNext::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{class_part_two_opt_next} +\end{center} +\end{figure} + + +\subsection{Detailed Description} +It updates a couple of edges. + + + +Definition at line 19 of file part\_\-two\_\-opt\_\-next.h. + +The documentation for this class was generated from the following file:\begin{CompactItemize} +\item +part\_\-two\_\-opt\_\-next.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_partial_mapped_xover.tex b/trunk/paradiseo-mo/doc/latex/class_partial_mapped_xover.tex new file mode 100644 index 000000000..3578de26a --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_partial_mapped_xover.tex @@ -0,0 +1,32 @@ +\section{PartialMappedXover Class Reference} +\label{class_partial_mapped_xover}\index{PartialMappedXover@{PartialMappedXover}} +Partial Mapped Crossover. + + +{\tt \#include $<$partial\_\-mapped\_\-xover.h$>$} + +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +bool {\bf operator()} (Route \&\_\-\_\-route1, Route \&\_\-\_\-route2)\label{class_partial_mapped_xover_1cda6ea86ca36e5de0125f4ba5cfc695} + +\end{CompactItemize} +\subsection*{Private Member Functions} +\begin{CompactItemize} +\item +void {\bf repair} (Route \&\_\-\_\-route, unsigned \_\-\_\-cut1, unsigned \_\-\_\-cut2)\label{class_partial_mapped_xover_b6d4035544aff3b2b3fe4b0eeea185a2} + +\end{CompactItemize} + + +\subsection{Detailed Description} +Partial Mapped Crossover. + + + +Definition at line 20 of file partial\_\-mapped\_\-xover.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +partial\_\-mapped\_\-xover.h\item +partial\_\-mapped\_\-xover.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_route_eval.tex b/trunk/paradiseo-mo/doc/latex/class_route_eval.tex new file mode 100644 index 000000000..656061643 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_route_eval.tex @@ -0,0 +1,26 @@ +\section{RouteEval Class Reference} +\label{class_route_eval}\index{RouteEval@{RouteEval}} +Route Evaluator. + + +{\tt \#include $<$route\_\-eval.h$>$} + +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +void {\bf operator()} (Route \&\_\-\_\-route)\label{class_route_eval_e10bbe6f792e6f44405953de4f703901} + +\end{CompactItemize} + + +\subsection{Detailed Description} +Route Evaluator. + + + +Definition at line 20 of file route\_\-eval.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +route\_\-eval.h\item +route\_\-eval.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_route_init.tex b/trunk/paradiseo-mo/doc/latex/class_route_init.tex new file mode 100644 index 000000000..aabbfd29f --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_route_init.tex @@ -0,0 +1,21 @@ +\section{RouteInit Class Reference} +\label{class_route_init}\index{RouteInit@{RouteInit}} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +void {\bf operator()} (Route \&\_\-\_\-route)\label{class_route_init_b65a7137e114458faadb6a5510c001f7} + +\end{CompactItemize} + + +\subsection{Detailed Description} + + + + +Definition at line 19 of file route\_\-init.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +route\_\-init.h\item +route\_\-init.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt.eps new file mode 100644 index 000000000..e9c3ce886 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 322.581 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 1.55 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(TwoOpt) cw +(moMove< Route >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (TwoOpt) 0 0 box + (moMove< Route >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt.tex new file mode 100644 index 000000000..15f41db39 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt.tex @@ -0,0 +1,36 @@ +\section{TwoOpt Class Reference} +\label{class_two_opt}\index{TwoOpt@{TwoOpt}} +Inheritance diagram for TwoOpt::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{class_two_opt} +\end{center} +\end{figure} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +{\bf TwoOpt} {\bf operator!} () const\label{class_two_opt_bc412d9f7fe3617cafef364f860d8d41} + +\item +void {\bf operator()} (Route \&\_\-\_\-route)\label{class_two_opt_ff87d1649a33d42a6d64e8d314ed1af0} + +\item +void {\bf readFrom} (std::istream \&\_\-\_\-is)\label{class_two_opt_feccfecca2a6bd2d3a12afdf3f724be0} + +\item +void {\bf printOn} (std::ostream \&\_\-\_\-os) const\label{class_two_opt_77ea59d81dd829ee3190219fa8659adc} + +\end{CompactItemize} + + +\subsection{Detailed Description} + + + + +Definition at line 22 of file two\_\-opt.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +two\_\-opt.h\item +two\_\-opt.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.eps new file mode 100644 index 000000000..bf3b9428f --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 219.78 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 2.275 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(TwoOptIncrEval) cw +(moMoveIncrEval< TwoOpt >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (TwoOptIncrEval) 0 0 box + (moMoveIncrEval< TwoOpt >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.tex new file mode 100644 index 000000000..73a736caa --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.tex @@ -0,0 +1,27 @@ +\section{TwoOptIncrEval Class Reference} +\label{class_two_opt_incr_eval}\index{TwoOptIncrEval@{TwoOptIncrEval}} +Inheritance diagram for TwoOptIncrEval::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{class_two_opt_incr_eval} +\end{center} +\end{figure} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +float {\bf operator()} (const {\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-route)\label{class_two_opt_incr_eval_4574d0b22065be5b59b88791e2b61138} + +\end{CompactItemize} + + +\subsection{Detailed Description} + + + + +Definition at line 18 of file two\_\-opt\_\-incr\_\-eval.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +two\_\-opt\_\-incr\_\-eval.h\item +two\_\-opt\_\-incr\_\-eval.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_init.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt_init.eps new file mode 100644 index 000000000..29f75025b --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_init.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 264.901 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 1.8875 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(TwoOptInit) cw +(moMoveInit< TwoOpt >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (TwoOptInit) 0 0 box + (moMoveInit< TwoOpt >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_init.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt_init.tex new file mode 100644 index 000000000..92af43cce --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_init.tex @@ -0,0 +1,32 @@ +\section{TwoOptInit Class Reference} +\label{class_two_opt_init}\index{TwoOptInit@{TwoOptInit}} +It sets the first couple of edges. + + +{\tt \#include $<$two\_\-opt\_\-init.h$>$} + +Inheritance diagram for TwoOptInit::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{class_two_opt_init} +\end{center} +\end{figure} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +void {\bf operator()} ({\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-route)\label{class_two_opt_init_5bf6af064d37ebd955ffb5a623e78e1b} + +\end{CompactItemize} + + +\subsection{Detailed Description} +It sets the first couple of edges. + + + +Definition at line 20 of file two\_\-opt\_\-init.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +two\_\-opt\_\-init.h\item +two\_\-opt\_\-init.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_next.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt_next.eps new file mode 100644 index 000000000..f9ec94747 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_next.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 250 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 2 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(TwoOptNext) cw +(moNextMove< TwoOpt >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (TwoOptNext) 0 0 box + (moNextMove< TwoOpt >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_next.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt_next.tex new file mode 100644 index 000000000..72c11bd39 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_next.tex @@ -0,0 +1,33 @@ +\section{TwoOptNext Class Reference} +\label{class_two_opt_next}\index{TwoOptNext@{TwoOptNext}} +It updates a couple of edges. + + +{\tt \#include $<$two\_\-opt\_\-next.h$>$} + +Inheritance diagram for TwoOptNext::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{class_two_opt_next} +\end{center} +\end{figure} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +bool {\bf operator()} ({\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-route)\label{class_two_opt_next_baf229b2e056f39ab971cf2ac66a833e} + +\end{CompactItemize} + + +\subsection{Detailed Description} +It updates a couple of edges. + + + +Definition at line 19 of file two\_\-opt\_\-next.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +two\_\-opt\_\-next.h\item +part\_\-two\_\-opt\_\-next.cpp\item +two\_\-opt\_\-next.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.eps new file mode 100644 index 000000000..c8b101630 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 243.902 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 2.05 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(TwoOptRand) cw +(moRandMove< TwoOpt >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (TwoOptRand) 0 0 box + (moRandMove< TwoOpt >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.tex new file mode 100644 index 000000000..51435f1ab --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.tex @@ -0,0 +1,27 @@ +\section{TwoOptRand Class Reference} +\label{class_two_opt_rand}\index{TwoOptRand@{TwoOptRand}} +Inheritance diagram for TwoOptRand::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{class_two_opt_rand} +\end{center} +\end{figure} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +void {\bf operator()} ({\bf TwoOpt} \&\_\-\_\-move)\label{class_two_opt_rand_bcba673ec71e565f536674bfe5bab609} + +\end{CompactItemize} + + +\subsection{Detailed Description} + + + + +Definition at line 19 of file two\_\-opt\_\-rand.h. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +two\_\-opt\_\-rand.h\item +two\_\-opt\_\-rand.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.eps new file mode 100644 index 000000000..50975105c --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 266.667 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 1.875 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(TwoOptTabuList) cw +(moTabuList< TwoOpt >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (TwoOptTabuList) 0 0 box + (moTabuList< TwoOpt >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.tex new file mode 100644 index 000000000..e86575335 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.tex @@ -0,0 +1,76 @@ +\section{TwoOptTabuList Class Reference} +\label{class_two_opt_tabu_list}\index{TwoOptTabuList@{TwoOptTabuList}} +The table of tabu movements, i.e. + + +{\tt \#include $<$two\_\-opt\_\-tabu\_\-list.h$>$} + +Inheritance diagram for TwoOptTabuList::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{class_two_opt_tabu_list} +\end{center} +\end{figure} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +bool {\bf operator()} (const {\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-sol)\label{class_two_opt_tabu_list_94eb6bced415ff97cec89107cc6eebab} + +\item +void {\bf add} (const {\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-sol)\label{class_two_opt_tabu_list_10436d67bef09f5893df2d85549d1dbd} + +\item +void {\bf update} () +\begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item +void {\bf init} () +\begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Attributes} +\begin{CompactItemize} +\item +std::vector$<$ std::vector$<$ unsigned $>$ $>$ {\bf tabu\_\-span}\label{class_two_opt_tabu_list_cbcdf3b501f624a14f3c767652609382} + +\end{CompactItemize} + + +\subsection{Detailed Description} +The table of tabu movements, i.e. + +forbidden edges + + + +Definition at line 20 of file two\_\-opt\_\-tabu\_\-list.h. + +\subsection{Member Function Documentation} +\index{TwoOptTabuList@{TwoOptTabuList}!update@{update}} +\index{update@{update}!TwoOptTabuList@{TwoOptTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void TwoOptTabuList::update ()\hspace{0.3cm}{\tt [virtual]}}\label{class_two_opt_tabu_list_c460034b7debe7198c6df046855155da} + + +Procedure that updates the tabu list content. + +Generally, a counter associated to each saved move is decreased by one. + +Implements {\bf moTabuList$<$ TwoOpt $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. + +Definition at line 46 of file two\_\-opt\_\-tabu\_\-list.cpp. + +References tabu\_\-span.\index{TwoOptTabuList@{TwoOptTabuList}!init@{init}} +\index{init@{init}!TwoOptTabuList@{TwoOptTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void TwoOptTabuList::init ()\hspace{0.3cm}{\tt [virtual]}}\label{class_two_opt_tabu_list_2d3101e6045700b0e32f5e82672a175e} + + +Procedure which initialises the tabu list. + +Can be useful if the data structure needs to be allocated before being used. + +Implements {\bf moTabuList$<$ TwoOpt $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. + +Definition at line 17 of file two\_\-opt\_\-tabu\_\-list.cpp. + +References Graph::size(), and tabu\_\-span. + +The documentation for this class was generated from the following files:\begin{CompactItemize} +\item +two\_\-opt\_\-tabu\_\-list.h\item +two\_\-opt\_\-tabu\_\-list.cpp\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_algo.tex b/trunk/paradiseo-mo/doc/latex/classmo_algo.tex index 6564c8f7a..f6caacbe7 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_algo.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_algo.tex @@ -5,12 +5,6 @@ Description of an algorithm of the paradiseo-mo library. {\tt \#include $<$moAlgo.h$>$} -Inheritance diagram for moAlgo$<$ EOT $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=4cm]{classmo_algo} -\end{center} -\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps index da056c4c6..fbf0b26ef 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 119.76 +%%BoundingBox: 0 0 500 109.29 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 4.175 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 4.575 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw -(eoFunctorBase) cw (moImprBestFitAspirCrit< M >) cw (moNoAspirCrit< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -190,21 +188,11 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moAspirCrit< M >) 0.5 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0.5 2 box - (eoFunctorBase) 0.5 3 box (moImprBestFitAspirCrit< M >) 0 0 box (moNoAspirCrit< M >) 1 0 box % ----- relations ----- -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -1 0.5 3 in solid 1 0.5 0.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex index 78dea621f..af40895ad 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex @@ -8,7 +8,7 @@ Description of the conditions in which a tabu move could be accepted. Inheritance diagram for moAspirCrit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3.35329cm]{classmo_aspir_crit} +\includegraphics[height=2cm]{classmo_aspir_crit} \end{center} \end{figure} \subsection*{Public Member Functions} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.eps b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.eps index e1504ce28..f9c367972 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 303.03 +%%BoundingBox: 0 0 500 259.74 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.925 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moBestImprSelect< M >) cw (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moBestImprSelect< M >) 0 0 box (moMoveSelect< M >) 0 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex index 1cb7a44d5..bc5e36915 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. Inheritance diagram for moBestImprSelect$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_best_impr_select} +\includegraphics[height=2cm]{classmo_best_impr_select} \end{center} \end{figure} \subsection*{Public Types} @@ -77,7 +77,7 @@ Definition at line 47 of file moBestImprSelect.h. References moBestImprSelect$<$ M $>$::best\_\-fit, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time.\index{moBestImprSelect@{moBestImprSelect}!operator()@{operator()}} \index{operator()@{operator()}!moBestImprSelect@{moBestImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moBestImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moBestImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} Procedure which saved the best move and fitness. @@ -94,8 +94,6 @@ Procedure which saved the best move and fitness. \end{Desc} -Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. - Definition at line 68 of file moBestImprSelect.h. References moBestImprSelect$<$ M $>$::best\_\-fit, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_comparator.eps b/trunk/paradiseo-mo/doc/latex/classmo_comparator.eps new file mode 100644 index 000000000..ed564a84f --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_comparator.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 242.424 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 2.0625 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(moComparator< EOT >) cw +(moFitComparator< EOT >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (moComparator< EOT >) 0 1 box + (moFitComparator< EOT >) 0 0 box + +% ----- relations ----- + +solid +1 0 0.25 out +solid +0 0 0.75 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_comparator.tex b/trunk/paradiseo-mo/doc/latex/classmo_comparator.tex new file mode 100644 index 000000000..4f7fdff71 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_comparator.tex @@ -0,0 +1,29 @@ +\section{moComparator$<$ EOT $>$ Class Template Reference} +\label{classmo_comparator}\index{moComparator@{moComparator}} +Template for classes which need to compare two EOT and indicate if the first is \char`\"{}better\char`\"{} than the second. + + +{\tt \#include $<$moComparator.h$>$} + +Inheritance diagram for moComparator$<$ EOT $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{classmo_comparator} +\end{center} +\end{figure} + + +\subsection{Detailed Description} +\subsubsection*{template$<$class EOT$>$ class moComparator$<$ EOT $>$} + +Template for classes which need to compare two EOT and indicate if the first is \char`\"{}better\char`\"{} than the second. + +The objects that extend this template describe how an EOT is \char`\"{}better\char`\"{} than an other. + + + +Definition at line 21 of file moComparator.h. + +The documentation for this class was generated from the following file:\begin{CompactItemize} +\item +moComparator.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps index 099ff0bb2..a1d0c2d59 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 203.046 +%%BoundingBox: 0 0 500 101.523 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.4625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 4.925 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moCoolingSchedule) cw -(eoUF< double &, bool >) cw -(eoFunctorBase) cw (moExponentialCoolingSchedule) cw (moLinearCoolingSchedule) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -190,21 +188,11 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moCoolingSchedule) 0.5 1 box - (eoUF< double &, bool >) 0.5 2 box - (eoFunctorBase) 0.5 3 box (moExponentialCoolingSchedule) 0 0 box (moLinearCoolingSchedule) 1 0 box % ----- relations ----- -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -1 0.5 3 in solid 1 0.5 0.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex index 47648d9d0..1a48c27d7 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex @@ -8,7 +8,7 @@ This class gives the description of a cooling schedule. Inheritance diagram for moCoolingSchedule::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_cooling_schedule} +\includegraphics[height=2cm]{classmo_cooling_schedule} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps index 92ecef949..9a4b2773b 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 406.091 +%%BoundingBox: 0 0 500 203.046 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.23125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.4625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moExponentialCoolingSchedule) cw (moCoolingSchedule) cw -(eoUF< double &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moExponentialCoolingSchedule) 0 0 box (moCoolingSchedule) 0 1 box - (eoUF< double &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex index b572655f6..e4b4643d9 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. Inheritance diagram for moExponentialCoolingSchedule::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_exponential_cooling_schedule} +\includegraphics[height=2cm]{classmo_exponential_cooling_schedule} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -58,7 +58,7 @@ Definition at line 31 of file moExponentialCoolingSchedule.h. \subsection{Member Function Documentation} \index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!operator()@{operator()}} \index{operator()@{operator()}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moExponentialCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moExponentialCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} Function which proceeds to the cooling. @@ -74,8 +74,6 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature $\ast$ ratio) is greater than the threshold. \end{Desc} -Implements {\bf eoUF$<$ double \&, bool $>$}. - Definition at line 41 of file moExponentialCoolingSchedule.h. References ratio, and threshold. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.eps b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.eps index 7057473a9..04ffcb96d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 303.03 +%%BoundingBox: 0 0 500 258.065 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.9375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moFirstImprSelect< M >) cw (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moFirstImprSelect< M >) 0 0 box (moMoveSelect< M >) 0 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex index 412bfec33..c09a27412 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex @@ -8,7 +8,7 @@ One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. Inheritance diagram for moFirstImprSelect$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_first_impr_select} +\includegraphics[height=2cm]{classmo_first_impr_select} \end{center} \end{figure} \subsection*{Public Types} @@ -90,7 +90,7 @@ Definition at line 52 of file moFirstImprSelect.h. References moFirstImprSelect$<$ M $>$::best\_\-fit, moFirstImprSelect$<$ M $>$::best\_\-move, moFirstImprSelect$<$ M $>$::init\_\-fit, and moFirstImprSelect$<$ M $>$::valid.\index{moFirstImprSelect@{moFirstImprSelect}!operator()@{operator()}} \index{operator()@{operator()}!moFirstImprSelect@{moFirstImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moFirstImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moFirstImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} Procedure which saved the best move and fitness. @@ -107,8 +107,6 @@ Procedure which saved the best move and fitness. \end{Desc} -Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. - Definition at line 76 of file moFirstImprSelect.h. References moFirstImprSelect$<$ M $>$::best\_\-fit, moFirstImprSelect$<$ M $>$::best\_\-move, and moFirstImprSelect$<$ M $>$::valid. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.eps b/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.eps new file mode 100644 index 000000000..802516e3a --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 242.424 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 2.0625 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(moFitComparator< EOT >) cw +(moComparator< EOT >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (moFitComparator< EOT >) 0 0 box + (moComparator< EOT >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.tex b/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.tex new file mode 100644 index 000000000..c58ab9d97 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.tex @@ -0,0 +1,35 @@ +\section{moFitComparator$<$ EOT $>$ Class Template Reference} +\label{classmo_fit_comparator}\index{moFitComparator@{moFitComparator}} +Comparison according to the fitness. + + +{\tt \#include $<$moFitComparator.h$>$} + +Inheritance diagram for moFitComparator$<$ EOT $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{classmo_fit_comparator} +\end{center} +\end{figure} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +bool {\bf operator()} (const EOT \&\_\-solution1, const EOT \&\_\-solution2)\label{classmo_fit_comparator_c920d5a49deb16710daf1e5fcde6b16c} + +\end{CompactItemize} + + +\subsection{Detailed Description} +\subsubsection*{template$<$class EOT$>$ class moFitComparator$<$ EOT $>$} + +Comparison according to the fitness. + +An EOT is better than an other if its fitness is better. + + + +Definition at line 20 of file moFitComparator.h. + +The documentation for this class was generated from the following file:\begin{CompactItemize} +\item +moFitComparator.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex index ac4cb93aa..339ea379b 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex @@ -1,11 +1,11 @@ -\section{mo\-Fit\-Sol\-Continue$<$ EOT $>$ Class Template Reference} +\section{moFitSolContinue$<$ EOT $>$ Class Template Reference} \label{classmo_fit_sol_continue}\index{moFitSolContinue@{moFitSolContinue}} One possible stop criterion for a solution-based heuristic. -{\tt \#include $<$mo\-Fit\-Sol\-Continue.h$>$} +{\tt \#include $<$moFitSolContinue.h$>$} -Inheritance diagram for mo\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for moFitSolContinue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=2cm]{classmo_fit_sol_continue} @@ -14,28 +14,28 @@ Inheritance diagram for mo\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef EOT::Fitness \bf{Fitness}\label{classmo_fit_sol_continue_369ed94a788d8bdc08d5554f7669376f} +typedef EOT::Fitness {\bf Fitness}\label{classmo_fit_sol_continue_369ed94a788d8bdc08d5554f7669376f} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -\bf{mo\-Fit\-Sol\-Continue} (\bf{Fitness} \_\-\_\-fitness) +{\bf moFitSolContinue} ({\bf Fitness} \_\-\_\-fitness) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item -bool \bf{operator()} (const EOT \&\_\-\_\-sol) +bool {\bf operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item -void \bf{init} () +void {\bf init} () \begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -\bf{Fitness} \bf{fitness}\label{classmo_fit_sol_continue_87d0ba8f2f76f61c89317eed5f094dfc} +{\bf Fitness} {\bf fitness}\label{classmo_fit_sol_continue_87d0ba8f2f76f61c89317eed5f094dfc} \begin{CompactList}\small\item\em Fitness target. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class mo\-Fit\-Sol\-Continue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class moFitSolContinue$<$ EOT $>$} One possible stop criterion for a solution-based heuristic. @@ -43,12 +43,12 @@ The stop criterion corresponds to a fitness threshold gained. -Definition at line 21 of file mo\-Fit\-Sol\-Continue.h. +Definition at line 21 of file moFitSolContinue.h. \subsection{Constructor \& Destructor Documentation} -\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!moFitSolContinue@{moFitSolContinue}} -\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Fit\-Sol\-Continue} (\bf{Fitness} {\em \_\-\_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_b14f37ba88de4e12583b22f5aabeb682} +\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{moFitSolContinue}} +\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{moFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moFitSolContinue}$<$ EOT $>$::{\bf moFitSolContinue} ({\bf Fitness} {\em \_\-\_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_b14f37ba88de4e12583b22f5aabeb682} Basic constructor. @@ -60,12 +60,12 @@ Basic constructor. \end{Desc} -Definition at line 33 of file mo\-Fit\-Sol\-Continue.h. +Definition at line 33 of file moFitSolContinue.h. \subsection{Member Function Documentation} -\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!operator()@{operator()}} -\index{operator()@{operator()}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_fa9f0a15f99c998115cae9b456403a27} +\index{moFitSolContinue@{moFitSolContinue}!operator()@{operator()}} +\index{operator()@{operator()}!moFitSolContinue@{moFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_fa9f0a15f99c998115cae9b456403a27} Function that activates the stopping criterion. @@ -81,21 +81,21 @@ Indicates if the fitness threshold has not yet been reached. \item[Returns:]true or false according to the value of the fitness. \end{Desc} -Definition at line 43 of file mo\-Fit\-Sol\-Continue.h. +Definition at line 43 of file moFitSolContinue.h. -References mo\-Fit\-Sol\-Continue$<$ EOT $>$::fitness.\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!init@{init}} -\index{init@{init}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c} +References moFitSolContinue$<$ EOT $>$::fitness.\index{moFitSolContinue@{moFitSolContinue}!init@{init}} +\index{init@{init}!moFitSolContinue@{moFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moFitSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c} Procedure which allows to initialise all the stuff needed. It can be also used to reinitialize all the needed things. -Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. +Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. -Definition at line 57 of file mo\-Fit\-Sol\-Continue.h. +Definition at line 57 of file moFitSolContinue.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Fit\-Sol\-Continue.h\end{CompactItemize} +moFitSolContinue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps index c73c60ba3..c9e65107d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 441.989 +%%BoundingBox: 0 0 500 227.273 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.2 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moGenSolContinue< EOT >) cw (moSolContinue< EOT >) cw -(eoUF< const EOT &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moGenSolContinue< EOT >) 0 0 box (moSolContinue< EOT >) 0 1 box - (eoUF< const EOT &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex index 19c044b84..bb62d1690 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex @@ -8,7 +8,7 @@ One possible stop criterion for a solution-based heuristic. Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_gen_sol_continue} +\includegraphics[height=2cm]{classmo_gen_sol_continue} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -62,7 +62,7 @@ Definition at line 30 of file moGenSolContinue.h. \subsection{Member Function Documentation} \index{moGenSolContinue@{moGenSolContinue}!operator()@{operator()}} \index{operator()@{operator()}!moGenSolContinue@{moGenSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moGenSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moGenSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} Function that activates the stop criterion. @@ -78,8 +78,6 @@ Increments the counter and returns TRUE if the current number of iteration is lo \item[Returns:]TRUE or FALSE according to the current generation number. \end{Desc} -Implements {\bf eoUF$<$ const EOT \&, bool $>$}. - Definition at line 44 of file moGenSolContinue.h. References moGenSolContinue$<$ EOT $>$::maxNumGen, and moGenSolContinue$<$ EOT $>$::numGen.\index{moGenSolContinue@{moGenSolContinue}!init@{init}} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c.eps b/trunk/paradiseo-mo/doc/latex/classmo_h_c.eps index 184d2041a..648f11f20 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_h_c.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 271.739 +%%BoundingBox: 0 0 500 268.456 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def -/cols 2 def +/rows 2 def +/cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,10 +175,6 @@ boxfont setfont 1 boundaspect scale (moHC< M >) cw (moAlgo< M::EOType >) cw -(eoMonOp< M::EOType >) cw -(eoOp< EOType >) cw -(eoUF< M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,32 +186,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moHC< M >) 0.5 0 box - (moAlgo< M::EOType >) 0.5 1 box - (eoMonOp< M::EOType >) 0.5 2 box - (eoOp< EOType >) 0 3 box - (eoUF< M::EOType &, bool >) 1 3 box - (eoFunctorBase) 1 4 box + (moHC< M >) 0 0 box + (moAlgo< M::EOType >) 0 1 box % ----- relations ----- solid -0 0.5 0 out +0 0 0 out solid -1 0.5 1 in -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -0 1 3 conn -solid -1 0 3 in -solid -1 1 3 in -solid -0 1 3 out -solid -1 1 4 in +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex b/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex index b402914eb..43d27ff2b 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex @@ -8,15 +8,15 @@ Hill Climbing (HC). Inheritance diagram for moHC$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=5cm]{classmo_h_c} +\includegraphics[height=2cm]{classmo_h_c} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Full constructor. \item\end{CompactList}\item -{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Light constructor. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launches the HC. \item\end{CompactList}\end{CompactItemize} @@ -35,7 +35,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd {\bf moMoveExpl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_h_c_f6bfb4553fb699f1e08f7d9c37d06103} \begin{CompactList}\small\item\em Complete exploration of the neighborhood. \item\end{CompactList}\item -{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} +eoEvalFunc$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} @@ -54,7 +54,7 @@ Definition at line 26 of file moHC.h. \subsection{Constructor \& Destructor Documentation} \index{moHC@{moHC}!moHC@{moHC}} \index{moHC@{moHC}!moHC@{moHC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} Full constructor. @@ -70,7 +70,7 @@ All the boxes are given in order the HC to use a \doxyref{moHCMoveLoopExpl}{p.}{ Definition at line 53 of file moHC.h.\index{moHC@{moHC}!moHC@{moHC}} \index{moHC@{moHC}!moHC@{moHC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} Light constructor. @@ -89,7 +89,7 @@ Definition at line 67 of file moHC.h. \subsection{Member Function Documentation} \index{moHC@{moHC}!operator()@{operator()}} \index{operator()@{operator()}!moHC@{moHC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moHC}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moHC}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} Function which launches the HC. @@ -105,8 +105,6 @@ The HC has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a} \item[Returns:]TRUE. \end{Desc} -Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. - Definition at line 82 of file moHC.h. References moHC$<$ M $>$::full\_\-eval, and moHC$<$ M $>$::move\_\-expl. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps index 1240e010d..1383bbf1b 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 327.869 +%%BoundingBox: 0 0 500 346.821 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.44167 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -176,8 +176,6 @@ boxfont setfont (moHCMoveLoopExpl< M >) cw (moMoveLoopExpl< M >) cw (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale (moHCMoveLoopExpl< M >) 0 0 box (moMoveLoopExpl< M >) 0 1 box (moMoveExpl< M >) 0 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0 3 box - (eoFunctorBase) 0 4 box % ----- relations ----- @@ -205,11 +201,3 @@ solid 0 0 1 out solid 1 0 2 in -solid -0 0 2 out -solid -1 0 3 in -solid -0 0 3 out -solid -1 0 4 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex index 776f8a638..3065c7226 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex @@ -8,7 +8,7 @@ Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}. Inheritance diagram for moHCMoveLoopExpl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=5cm]{classmo_h_c_move_loop_expl} +\includegraphics[height=3cm]{classmo_h_c_move_loop_expl} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -75,7 +75,7 @@ Definition at line 43 of file moHCMoveLoopExpl.h. \subsection{Member Function Documentation} \index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!operator()@{operator()}} \index{operator()@{operator()}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moHCMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moHCMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} Procedure which launches the explorer. @@ -89,8 +89,6 @@ The exploration starts from an old solution and provides a new solution. \end{Desc} -Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}. - Definition at line 59 of file moHCMoveLoopExpl.h. References moHCMoveLoopExpl$<$ M $>$::incr\_\-eval, moHCMoveLoopExpl$<$ M $>$::move\_\-init, moHCMoveLoopExpl$<$ M $>$::move\_\-select, and moHCMoveLoopExpl$<$ M $>$::next\_\-move. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.eps b/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.eps new file mode 100644 index 000000000..1073e2446 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 268.456 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(moILS< M >) cw +(moAlgo< M::EOType >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (moILS< M >) 0 0 box + (moAlgo< M::EOType >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.tex b/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.tex new file mode 100644 index 000000000..4e47a90c4 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.tex @@ -0,0 +1,153 @@ +\section{moILS$<$ M $>$ Class Template Reference} +\label{classmo_i_l_s}\index{moILS@{moILS}} +Iterated Local Search (ILS). + + +{\tt \#include $<$moILS.h$>$} + +Inheritance diagram for moILS$<$ M $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{classmo_i_l_s} +\end{center} +\end{figure} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +{\bf moILS} ({\bf moAlgo}$<$ {\bf EOT} $>$ \&\_\-\_\-algo, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, eoMonOp$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\begin{CompactList}\small\item\em Generic constructor. \item\end{CompactList}\item +{\bf moILS} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, eoMonOp$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\begin{CompactList}\small\item\em Constructor for using a \doxyref{moHC}{p.}{classmo_h_c} for the \doxyref{moAlgo}{p.}{classmo_algo}. \item\end{CompactList}\item +{\bf moILS} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moTabuList}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-moTS\_\-continue, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, eoMonOp$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\begin{CompactList}\small\item\em Constructor for using a \doxyref{moTS}{p.}{classmo_t_s} for the \doxyref{moAlgo}{p.}{classmo_algo}. \item\end{CompactList}\item +{\bf moILS} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-moSA\_\-continue, double \_\-\_\-init\_\-temp, {\bf moCoolingSchedule} \&\_\-\_\-cool\_\-sched, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, eoMonOp$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\begin{CompactList}\small\item\em Constructor for using a \doxyref{moTS}{p.}{classmo_t_s} for the \doxyref{moAlgo}{p.}{classmo_algo}. \item\end{CompactList}\item +bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em Function which launches the ILS. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Types} +\begin{CompactItemize} +\item +typedef M::EOType {\bf EOT}\label{classmo_i_l_s_c81bafc611e4d4fd44347cf7162198c7} + +\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item +typedef EOT::Fitness {\bf Fitness}\label{classmo_i_l_s_8c464a9eae064a78eff75d4c722b619c} + +\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Attributes} +\begin{CompactItemize} +\item +{\bf moAlgo}$<$ {\bf EOT} $>$ \& {\bf algo}\label{classmo_i_l_s_8373e40b60afdd761789a97b47adece9} + +\begin{CompactList}\small\item\em The solution based heuristic. \item\end{CompactList}\item +{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_i_l_s_c3046ba0a31a35470391987ac37afd64} + +\begin{CompactList}\small\item\em The stopping criterion. \item\end{CompactList}\item +{\bf moComparator}$<$ {\bf EOT} $>$ \& {\bf acceptance\_\-criterion}\label{classmo_i_l_s_295f6d0342c67bd3dc4cb82e2adc26be} + +\begin{CompactList}\small\item\em The acceptance criterion. \item\end{CompactList}\item +eoMonOp$<$ {\bf EOT} $>$ \& {\bf perturbation}\label{classmo_i_l_s_f667a1bda06b6d221292df9aba3db8a2} + +\begin{CompactList}\small\item\em The perturbation generator. \item\end{CompactList}\item +eoEvalFunc$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_i_l_s_8000f02fac668d51026e458c9febce7c} + +\begin{CompactList}\small\item\em The full evaluation function. \item\end{CompactList}\end{CompactItemize} + + +\subsection{Detailed Description} +\subsubsection*{template$<$class M$>$ class moILS$<$ M $>$} + +Iterated Local Search (ILS). + +Class which describes the algorithm for a iterated local search. + + + +Definition at line 25 of file moILS.h. + +\subsection{Constructor \& Destructor Documentation} +\index{moILS@{moILS}!moILS@{moILS}} +\index{moILS@{moILS}!moILS@{moILS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moAlgo}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-algo}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, eoMonOp$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_f7f2fc1f905954d78edcec0e3ca53551} + + +Generic constructor. + +Generic constructor using a \doxyref{moAlgo}{p.}{classmo_algo} + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-algo}]The solution based heuristic to use. \item[{\em \_\-\_\-continue}]The stopping criterion. \item[{\em \_\-\_\-acceptance\_\-criterion}]The acceptance criterion. \item[{\em \_\-\_\-perturbation}]The pertubation generator. \item[{\em \_\-\_\-full\_\-eval}]The evaluation function. \end{description} +\end{Desc} + + +Definition at line 46 of file moILS.h.\index{moILS@{moILS}!moILS@{moILS}} +\index{moILS@{moILS}!moILS@{moILS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, eoMonOp$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_c4ebdab294ee1085ddcb9bf2a6882cf0} + + +Constructor for using a \doxyref{moHC}{p.}{classmo_h_c} for the \doxyref{moAlgo}{p.}{classmo_algo}. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-move\_\-init}]The move initialisation (for the \doxyref{moHC}{p.}{classmo_h_c}). \item[{\em \_\-\_\-next\_\-move}]The move generator (for the \doxyref{moHC}{p.}{classmo_h_c}). \item[{\em \_\-\_\-incr\_\-eval}]The partial evaluation function (for the \doxyref{moHC}{p.}{classmo_h_c}). \item[{\em \_\-\_\-move\_\-select}]The move selection strategy (for the \doxyref{moHC}{p.}{classmo_h_c}). \item[{\em \_\-\_\-continue}]The stopping criterion. \item[{\em \_\-\_\-acceptance\_\-criterion}]The acceptance criterion. \item[{\em \_\-\_\-perturbation}]The pertubation generator. \item[{\em \_\-\_\-full\_\-eval}]The evaluation function. \end{description} +\end{Desc} + + +Definition at line 62 of file moILS.h.\index{moILS@{moILS}!moILS@{moILS}} +\index{moILS@{moILS}!moILS@{moILS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-moTS\_\-continue}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, eoMonOp$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_d27e3435b8f6592091431fde6f185769} + + +Constructor for using a \doxyref{moTS}{p.}{classmo_t_s} for the \doxyref{moAlgo}{p.}{classmo_algo}. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-move\_\-init}]The move initialisation (for the \doxyref{moTS}{p.}{classmo_t_s}). \item[{\em \_\-\_\-next\_\-move}]The move generator (for the \doxyref{moTS}{p.}{classmo_t_s}). \item[{\em \_\-\_\-incr\_\-eval}]The partial evaluation function (for the \doxyref{moTS}{p.}{classmo_t_s}). \item[{\em \_\-\_\-tabu\_\-list}]The tabu list (for the \doxyref{moTS}{p.}{classmo_t_s} !!!!). \item[{\em \_\-\_\-aspir\_\-crit}]The aspiration criterion (for the \doxyref{moTS}{p.}{classmo_t_s}). \item[{\em \_\-\_\-moTS\_\-continue}]The stopping criterion (for the \doxyref{moTS}{p.}{classmo_t_s}). \item[{\em \_\-\_\-continue}]The stopping criterion. \item[{\em \_\-\_\-acceptance\_\-criterion}]The acceptance criterion. \item[{\em \_\-\_\-perturbation}]The pertubation generator. \item[{\em \_\-\_\-full\_\-eval}]The evaluation function. \end{description} +\end{Desc} + + +Definition at line 82 of file moILS.h.\index{moILS@{moILS}!moILS@{moILS}} +\index{moILS@{moILS}!moILS@{moILS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-moSA\_\-continue}, double {\em \_\-\_\-init\_\-temp}, {\bf moCoolingSchedule} \& {\em \_\-\_\-cool\_\-sched}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, eoMonOp$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_292acc5218e8f148e8b174f183820696} + + +Constructor for using a \doxyref{moTS}{p.}{classmo_t_s} for the \doxyref{moAlgo}{p.}{classmo_algo}. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-move\_\-rand}]The random move generator (for the \doxyref{moSA}{p.}{classmo_s_a}). \item[{\em \_\-\_\-incr\_\-eval}]The partial evaluation function (for the \doxyref{moSA}{p.}{classmo_s_a}). \item[{\em \_\-\_\-moSA\_\-continue}]The stopping criterion (for the \doxyref{moSA}{p.}{classmo_s_a}). \item[{\em \_\-\_\-init\_\-temp}]The initial temperature (for the \doxyref{moSA}{p.}{classmo_s_a}). \item[{\em \_\-\_\-cool\_\-sched}]The cooling scheduler (for the \doxyref{moSA}{p.}{classmo_s_a}). \item[{\em \_\-\_\-continue}]The stopping criterion. \item[{\em \_\-\_\-acceptance\_\-criterion}]The acceptance criterion. \item[{\em \_\-\_\-perturbation}]The pertubation generator. \item[{\em \_\-\_\-full\_\-eval}]The evaluation function. \end{description} +\end{Desc} + + +Definition at line 102 of file moILS.h. + +\subsection{Member Function Documentation} +\index{moILS@{moILS}!operator()@{operator()}} +\index{operator()@{operator()}!moILS@{moILS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moILS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_b3954a77b43fee31122d2a210b2a82d7} + + +Function which launches the ILS. + +The ILS has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a}, the \doxyref{moTS}{p.}{classmo_t_s} and the \doxyref{moHC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionnary algorithm. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-sol}]a current solution to improve. \end{description} +\end{Desc} +\begin{Desc} +\item[Returns:]TRUE. \end{Desc} + + +Definition at line 119 of file moILS.h. + +References moILS$<$ M $>$::acceptance\_\-criterion, moILS$<$ M $>$::algo, moILS$<$ M $>$::cont, moILS$<$ M $>$::full\_\-eval, and moILS$<$ M $>$::perturbation. + +The documentation for this class was generated from the following file:\begin{CompactItemize} +\item +moILS.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps index b569936e2..41cee35a0 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 239.521 +%%BoundingBox: 0 0 500 218.579 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.2875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moImprBestFitAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moImprBestFitAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex index 6647d77fa..5d9b8e803 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}. Inheritance diagram for moImprBestFitAspirCrit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_impr_best_fit_aspir_crit} +\includegraphics[height=2cm]{classmo_impr_best_fit_aspir_crit} \end{center} \end{figure} \subsection*{Public Types} @@ -53,7 +53,7 @@ Definition at line 22 of file moImprBestFitAspirCrit.h. \subsection{Member Function Documentation} \index{moImprBestFitAspirCrit@{moImprBestFitAspirCrit}!operator()@{operator()}} \index{operator()@{operator()}!moImprBestFitAspirCrit@{moImprBestFitAspirCrit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moImprBestFitAspirCrit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moImprBestFitAspirCrit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b} Function that indicates if the fit is better that the already saved fit. @@ -69,8 +69,6 @@ The first time, the function only saved the current move and fitness. \item[Returns:]TRUE the first time and if \_\-\_\-fit $>$ best\_\-fit, else FALSE. \end{Desc} -Implements {\bf eoBF$<$ const M \&, const M::EOType::Fitness \&, bool $>$}. - Definition at line 52 of file moImprBestFitAspirCrit.h. References moImprBestFitAspirCrit$<$ M $>$::best\_\-fit, and moImprBestFitAspirCrit$<$ M $>$::first\_\-time. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps index 3c5267824..bc4ea56dc 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 316.206 +%%BoundingBox: 0 0 500 245.399 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.0375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moItRandNextMove< M >) cw (moNextMove< M >) cw -(eoBF< M &, const M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moItRandNextMove< M >) 0 0 box (moNextMove< M >) 0 1 box - (eoBF< M &, const M::EOType &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex index e7abc9a90..f74e8150a 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}. Inheritance diagram for moItRandNextMove$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_it_rand_next_move} +\includegraphics[height=2cm]{classmo_it_rand_next_move} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -57,7 +57,7 @@ Definition at line 22 of file moItRandNextMove.h. The constructor. -{\bf Parameters} only for initialising the attributes. +Parameters only for initialising the attributes. \begin{Desc} \item[Parameters:] @@ -71,7 +71,7 @@ Definition at line 37 of file moItRandNextMove.h. \subsection{Member Function Documentation} \index{moItRandNextMove@{moItRandNextMove}!operator()@{operator()}} \index{operator()@{operator()}!moItRandNextMove@{moItRandNextMove}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moItRandNextMove}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_it_rand_next_move_92a2fbbc02a20853b9a309e99018a102} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moItRandNextMove}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_92a2fbbc02a20853b9a309e99018a102} Generation of a new move. @@ -87,8 +87,6 @@ If the maximum number is not already reached, the current move is forgotten and \item[Returns:]FALSE if the maximum number of iteration is reached, else TRUE. \end{Desc} -Implements {\bf eoBF$<$ M \&, const M::EOType \&, bool $>$}. - Definition at line 52 of file moItRandNextMove.h. References moItRandNextMove$<$ M $>$::max\_\-iter, moItRandNextMove$<$ M $>$::num\_\-iter, and moItRandNextMove$<$ M $>$::rand\_\-move. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex b/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex index b9d378132..13bd383b8 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex @@ -5,23 +5,17 @@ Class which allows a checkpointing system. {\tt \#include $<$moLSCheckPoint.h$>$} -Inheritance diagram for moLSCheckPoint$<$ M $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_l_s_check_point} -\end{center} -\end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item void {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launches the checkpointing. \item\end{CompactList}\item -void {\bf add} ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f) +void {\bf add} (eoBF$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f) \begin{CompactList}\small\item\em Procedure which add a new function to the function vector. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -std::vector$<$ {\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} +std::vector$<$ eoBF$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} \begin{CompactList}\small\item\em vector of function \item\end{CompactList}\end{CompactItemize} @@ -58,7 +52,7 @@ Definition at line 34 of file moLSCheckPoint.h. References moLSCheckPoint$<$ M $>$::func.\index{moLSCheckPoint@{moLSCheckPoint}!add@{add}} \index{add@{add}!moLSCheckPoint@{moLSCheckPoint}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moLSCheckPoint}$<$ M $>$::add ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moLSCheckPoint}$<$ M $>$::add (eoBF$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} Procedure which add a new function to the function vector. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps index 3e62629a9..35d64af4d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 476.19 +%%BoundingBox: 0 0 500 238.095 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.05 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.1 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moLinearCoolingSchedule) cw (moCoolingSchedule) cw -(eoUF< double &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moLinearCoolingSchedule) 0 0 box (moCoolingSchedule) 0 1 box - (eoUF< double &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex index 59b77e02d..971b3203b 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. Inheritance diagram for moLinearCoolingSchedule::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_linear_cooling_schedule} +\includegraphics[height=2cm]{classmo_linear_cooling_schedule} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -58,7 +58,7 @@ Definition at line 31 of file moLinearCoolingSchedule.h. \subsection{Member Function Documentation} \index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!operator()@{operator()}} \index{operator()@{operator()}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moLinearCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moLinearCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} Function which proceeds to the cooling. @@ -74,8 +74,6 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature - quantity) is greater than the threshold. \end{Desc} -Implements {\bf eoUF$<$ double \&, bool $>$}. - Definition at line 41 of file moLinearCoolingSchedule.h. References quantity, and threshold. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_move.tex index e178fa21e..61a06c1fb 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move.tex @@ -5,12 +5,6 @@ Definition of a move. {\tt \#include $<$moMove.h$>$} -Inheritance diagram for moMove$<$ EOT $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_move} -\end{center} -\end{figure} \subsection*{Public Types} \begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.eps index 18fb8889f..708dd0b50 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 163.934 +%%BoundingBox: 0 0 500 173.41 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw (moMoveLoopExpl< M >) cw (moHCMoveLoopExpl< M >) cw (moTSMoveLoopExpl< M >) cw @@ -191,22 +189,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moMoveExpl< M >) 0.5 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0.5 3 box - (eoFunctorBase) 0.5 4 box (moMoveLoopExpl< M >) 0.5 1 box (moHCMoveLoopExpl< M >) 0 0 box (moTSMoveLoopExpl< M >) 1 0 box % ----- relations ----- -solid -0 0.5 2 out -solid -1 0.5 3 in -solid -0 0.5 3 out -solid -1 0.5 4 in solid 1 0.5 1.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex index 0e4a7e621..0d2a1554f 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex @@ -8,7 +8,7 @@ Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer. Inheritance diagram for moMoveExpl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4.59016cm]{classmo_move_expl} +\includegraphics[height=3cm]{classmo_move_expl} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex index 85bba26c1..b191f77fd 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex @@ -5,12 +5,6 @@ {\tt \#include $<$moMoveIncrEval.h$>$} -Inheritance diagram for moMoveIncrEval$<$ M $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_move_incr_eval} -\end{center} -\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex index 904ac7911..1f1daefa6 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex @@ -5,12 +5,6 @@ Move (\doxyref{moMove}{p.}{classmo_move}) initializer. {\tt \#include $<$moMoveInit.h$>$} -Inheritance diagram for moMoveInit$<$ M $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_move_init} -\end{center} -\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps index c6a78b5b1..76326be37 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 163.934 +%%BoundingBox: 0 0 500 173.41 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moMoveLoopExpl< M >) cw (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw (moHCMoveLoopExpl< M >) cw (moTSMoveLoopExpl< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale (moMoveLoopExpl< M >) 0.5 1 box (moMoveExpl< M >) 0.5 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0.5 3 box - (eoFunctorBase) 0.5 4 box (moHCMoveLoopExpl< M >) 0 0 box (moTSMoveLoopExpl< M >) 1 0 box @@ -204,14 +200,6 @@ solid solid 1 0.5 2 in solid -0 0.5 2 out -solid -1 0.5 3 in -solid -0 0.5 3 out -solid -1 0.5 4 in -solid 1 0.5 0.25 out solid 0 1 1 conn diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex index 15968268f..c9e640147 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex @@ -8,7 +8,7 @@ Class which describes an iterative explorer. Inheritance diagram for moMoveLoopExpl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4.59016cm]{classmo_move_loop_expl} +\includegraphics[height=3cm]{classmo_move_loop_expl} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_select.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_select.eps index b61e2bf9f..86a37c002 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_select.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 101.01 +%%BoundingBox: 0 0 500 83.8574 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 4.95 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 5.9625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 3 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw (moBestImprSelect< M >) cw (moFirstImprSelect< M >) cw (moRandImprSelect< M >) cw @@ -191,22 +189,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moMoveSelect< M >) 1 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 1 2 box - (eoFunctorBase) 1 3 box (moBestImprSelect< M >) 0 0 box (moFirstImprSelect< M >) 1 0 box (moRandImprSelect< M >) 2 0 box % ----- relations ----- -solid -0 1 1 out -solid -1 1 2 in -solid -0 1 2 out -solid -1 1 3 in solid 1 1 0.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex index 82d8378b7..b9693bcee 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex @@ -8,7 +8,7 @@ Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}). Inheritance diagram for moMoveSelect$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2.82828cm]{classmo_move_select} +\includegraphics[height=2cm]{classmo_move_select} \end{center} \end{figure} \subsection*{Public Types} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps b/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps index dfda1c365..d9586a593 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 316.206 +%%BoundingBox: 0 0 500 245.399 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.0375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moNextMove< M >) cw -(eoBF< M &, const M::EOType &, bool >) cw -(eoFunctorBase) cw (moItRandNextMove< M >) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -189,20 +187,10 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moNextMove< M >) 0 1 box - (eoBF< M &, const M::EOType &, bool >) 0 2 box - (eoFunctorBase) 0 3 box (moItRandNextMove< M >) 0 0 box % ----- relations ----- -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in solid 1 0 0.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex index 3fdea7d9d..764315620 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex @@ -8,7 +8,7 @@ Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}). Inheritance diagram for moNextMove$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_next_move} +\includegraphics[height=2cm]{classmo_next_move} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps index 8bc333965..4a1de4c86 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 239.521 +%%BoundingBox: 0 0 500 291.971 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.7125 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moNoAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moNoAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex index c9169ff46..220d5f3d8 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex @@ -8,7 +8,7 @@ One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspi Inheritance diagram for moNoAspirCrit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_no_aspir_crit} +\includegraphics[height=2cm]{classmo_no_aspir_crit} \end{center} \end{figure} \subsection*{Private Member Functions} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex index 390a2c38b..17d24521a 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex @@ -1,11 +1,11 @@ -\section{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$ Class Template Reference} +\section{moNoFitImprSolContinue$<$ EOT $>$ Class Template Reference} \label{classmo_no_fit_impr_sol_continue}\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}} One possible stop criterion for a solution-based heuristic. -{\tt \#include $<$mo\-No\-Fit\-Impr\-Sol\-Continue.h$>$} +{\tt \#include $<$moNoFitImprSolContinue.h$>$} -Inheritance diagram for mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for moNoFitImprSolContinue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=2cm]{classmo_no_fit_impr_sol_continue} @@ -14,37 +14,37 @@ Inheritance diagram for mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::\begin{figu \subsection*{Public Types} \begin{CompactItemize} \item -typedef EOT::Fitness \bf{Fitness}\label{classmo_no_fit_impr_sol_continue_64c184de66bb37d75d53aa600ac947b3} +typedef EOT::Fitness {\bf Fitness}\label{classmo_no_fit_impr_sol_continue_64c184de66bb37d75d53aa600ac947b3} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -\bf{mo\-No\-Fit\-Impr\-Sol\-Continue} (unsigned int \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement) +{\bf moNoFitImprSolContinue} (unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovement) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item -bool \bf{operator()} (const EOT \&\_\-\_\-sol) +bool {\bf operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item -void \bf{init} () +void {\bf init} () \begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int \bf{max\-Number\-Of\-Iterations\-Without\-Improvement}\label{classmo_no_fit_impr_sol_continue_03612ffc3af9d943c1b1d2cde09d461b} +unsigned int {\bf maxNumberOfIterationsWithoutImprovement}\label{classmo_no_fit_impr_sol_continue_03612ffc3af9d943c1b1d2cde09d461b} \begin{CompactList}\small\item\em Maximum number of iterations without improvement allowed. \item\end{CompactList}\item -bool \bf{first\-Fitness\-Saved}\label{classmo_no_fit_impr_sol_continue_ca3591e47a075b59e0826f31234c71ef} +bool {\bf firstFitnessSaved}\label{classmo_no_fit_impr_sol_continue_ca3591e47a075b59e0826f31234c71ef} \begin{CompactList}\small\item\em Flag that this is the first time that the fitness is used. \item\end{CompactList}\item -\bf{Fitness} \bf{fitness}\label{classmo_no_fit_impr_sol_continue_3d3d2b43a4dd73e38689cc0018d44ee7} +{\bf Fitness} {\bf fitness}\label{classmo_no_fit_impr_sol_continue_3d3d2b43a4dd73e38689cc0018d44ee7} \begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item -unsigned int \bf{counter}\label{classmo_no_fit_impr_sol_continue_46fc008a8f7cd06dcaaeb4016b433adb} +unsigned int {\bf counter}\label{classmo_no_fit_impr_sol_continue_46fc008a8f7cd06dcaaeb4016b433adb} \begin{CompactList}\small\item\em The iteration couter. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class moNoFitImprSolContinue$<$ EOT $>$} One possible stop criterion for a solution-based heuristic. @@ -52,12 +52,12 @@ The stop criterion corresponds to a maximum number of iterations without improve -Definition at line 21 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. +Definition at line 21 of file moNoFitImprSolContinue.h. \subsection{Constructor \& Destructor Documentation} -\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} -\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-No\-Fit\-Impr\-Sol\-Continue} (unsigned int {\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_a447aa0d8ed4ddf6fe47c805269cac6c} +\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} +\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moNoFitImprSolContinue}$<$ EOT $>$::{\bf moNoFitImprSolContinue} (unsigned int {\em \_\-\_\-maxNumberOfIterationWithoutImprovement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_a447aa0d8ed4ddf6fe47c805269cac6c} Basic constructor. @@ -65,16 +65,16 @@ Basic constructor. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement}]The number of iterations without fitness improvement to reach for stop. \end{description} +\item[{\em \_\-\_\-maxNumberOfIterationWithoutImprovement}]The number of iterations without fitness improvement to reach for stop. \end{description} \end{Desc} -Definition at line 33 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. +Definition at line 33 of file moNoFitImprSolContinue.h. \subsection{Member Function Documentation} -\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!operator()@{operator()}} -\index{operator()@{operator()}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_dbd663623cae56ec76ee504ecb226fed} +\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!operator()@{operator()}} +\index{operator()@{operator()}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moNoFitImprSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_dbd663623cae56ec76ee504ecb226fed} Function that activates the stopping criterion. @@ -88,23 +88,23 @@ Indicates if the fitness has not been improved since a given number of iteration \item[Returns:]true or false. \end{Desc} -Definition at line 43 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. +Definition at line 43 of file moNoFitImprSolContinue.h. -References mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::counter, mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::fitness, and mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Without\-Improvement.\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!init@{init}} -\index{init@{init}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4} +References moNoFitImprSolContinue$<$ EOT $>$::counter, moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved, moNoFitImprSolContinue$<$ EOT $>$::fitness, and moNoFitImprSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement.\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!init@{init}} +\index{init@{init}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moNoFitImprSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4} Procedure which allows to initialise all the stuff needed. It can be also used to reinitialize all the needed things. -Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. +Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. -Definition at line 77 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. +Definition at line 77 of file moNoFitImprSolContinue.h. -References mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::counter, and mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved. +References moNoFitImprSolContinue$<$ EOT $>$::counter, and moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-No\-Fit\-Impr\-Sol\-Continue.h\end{CompactItemize} +moNoFitImprSolContinue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps index fe55210a4..74d2fc0f6 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 303.03 +%%BoundingBox: 0 0 500 251.572 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.9875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moRandImprSelect< M >) cw (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moRandImprSelect< M >) 0 0 box (moMoveSelect< M >) 0 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex index 965d745cd..8fa7df0f8 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMove Inheritance diagram for moRandImprSelect$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_rand_impr_select} +\includegraphics[height=2cm]{classmo_rand_impr_select} \end{center} \end{figure} \subsection*{Public Types} @@ -96,7 +96,7 @@ Definition at line 56 of file moRandImprSelect.h. References moRandImprSelect$<$ M $>$::init\_\-fit, moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{moRandImprSelect}!operator()@{operator()}} \index{operator()@{operator()}!moRandImprSelect@{moRandImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moRandImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moRandImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} The move selection. @@ -115,11 +115,9 @@ One the saved move is randomly chosen. \end{Desc} -Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. - Definition at line 77 of file moRandImprSelect.h. -References eoRng::random(), moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves. +References moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex index 665d27245..87275c96c 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex @@ -5,12 +5,6 @@ Random move generator. {\tt \#include $<$moRandMove.h$>$} -Inheritance diagram for moRandMove$<$ M $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_rand_move} -\end{center} -\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_s_a.eps b/trunk/paradiseo-mo/doc/latex/classmo_s_a.eps index efa0100f9..90945c761 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_s_a.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_s_a.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 271.739 +%%BoundingBox: 0 0 500 268.456 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def -/cols 2 def +/rows 2 def +/cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,10 +175,6 @@ boxfont setfont 1 boundaspect scale (moSA< M >) cw (moAlgo< M::EOType >) cw -(eoMonOp< M::EOType >) cw -(eoOp< EOType >) cw -(eoUF< M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,32 +186,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moSA< M >) 0.5 0 box - (moAlgo< M::EOType >) 0.5 1 box - (eoMonOp< M::EOType >) 0.5 2 box - (eoOp< EOType >) 0 3 box - (eoUF< M::EOType &, bool >) 1 3 box - (eoFunctorBase) 1 4 box + (moSA< M >) 0 0 box + (moAlgo< M::EOType >) 0 1 box % ----- relations ----- solid -0 0.5 0 out +0 0 0 out solid -1 0.5 1 in -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -0 1 3 conn -solid -1 0 3 in -solid -1 1 3 in -solid -0 1 3 out -solid -1 1 4 in +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex index a58e3a510..374ffc7fb 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex @@ -8,13 +8,13 @@ Simulated Annealing (SA). Inheritance diagram for moSA$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=5cm]{classmo_s_a} +\includegraphics[height=2cm]{classmo_s_a} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moSA} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf moCoolingSchedule} \&\_\-\_\-cool\_\-sched, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf moSA} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf moCoolingSchedule} \&\_\-\_\-cool\_\-sched, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em SA constructor. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em function that launches the SA algorithm. \item\end{CompactList}\end{CompactItemize} @@ -45,7 +45,7 @@ double {\bf init\_\-temp}\label{classmo_s_a_f1af7636b52aa5f6b381f8187b667bd4} {\bf moCoolingSchedule} \& {\bf cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6} \begin{CompactList}\small\item\em The cooling schedule. \item\end{CompactList}\item -{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} +eoEvalFunc$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} @@ -64,7 +64,7 @@ Definition at line 30 of file moSA.h. \subsection{Constructor \& Destructor Documentation} \index{moSA@{moSA}!moSA@{moSA}} \index{moSA@{moSA}!moSA@{moSA}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moSA}$<$ M $>$::{\bf moSA} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, {\bf moCoolingSchedule} \& {\em \_\-\_\-cool\_\-sched}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moSA}$<$ M $>$::{\bf moSA} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, {\bf moCoolingSchedule} \& {\em \_\-\_\-cool\_\-sched}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9} SA constructor. @@ -83,7 +83,7 @@ Definition at line 58 of file moSA.h. \subsection{Member Function Documentation} \index{moSA@{moSA}!operator()@{operator()}} \index{operator()@{operator()}!moSA@{moSA}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSA}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSA}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} function that launches the SA algorithm. @@ -99,11 +99,9 @@ As a \doxyref{moTS}{p.}{classmo_t_s} or a \doxyref{moHC}{p.}{classmo_h_c}, the S \item[Returns:]TRUE. \end{Desc} -Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. - Definition at line 80 of file moSA.h. -References moSA$<$ M $>$::cont, moSA$<$ M $>$::cool\_\-sched, moSA$<$ M $>$::full\_\-eval, moSA$<$ M $>$::incr\_\-eval, moSA$<$ M $>$::init\_\-temp, moSA$<$ M $>$::move\_\-rand, and eoRng::uniform(). +References moSA$<$ M $>$::cont, moSA$<$ M $>$::cool\_\-sched, moSA$<$ M $>$::full\_\-eval, moSA$<$ M $>$::incr\_\-eval, moSA$<$ M $>$::init\_\-temp, and moSA$<$ M $>$::move\_\-rand. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps index 95d9a8476..624cb75de 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 277.778 +%%BoundingBox: 0 0 500 213.904 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.3375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moSimpleMoveTabuList< M >) cw (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleMoveTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box - (eoBF< const M &, const M::EOType &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex index d80f3328b..0349b3de0 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex @@ -8,7 +8,7 @@ Class describing a move tabu list with a limited memory. Inheritance diagram for moSimpleMoveTabuList$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_simple_move_tabu_list} +\includegraphics[height=2cm]{classmo_simple_move_tabu_list} \end{center} \end{figure} \subsection*{Public Types} @@ -62,7 +62,7 @@ Definition at line 22 of file moSimpleMoveTabuList.h. \subsection{Member Function Documentation} \index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!operator()@{operator()}} \index{operator()@{operator()}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleMoveTabuList}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleMoveTabuList}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a} Function that indicates if, in a given state, the \_\-move is tabu or not. @@ -76,8 +76,6 @@ Function that indicates if, in a given state, the \_\-move is tabu or not. \item[Returns:]true or false. \end{Desc} -Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}. - Definition at line 46 of file moSimpleMoveTabuList.h. References moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!add@{add}} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps index c673817e4..e46012fd0 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 277.778 +%%BoundingBox: 0 0 500 200 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.5 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moSimpleSolutionTabuList< M >) cw (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleSolutionTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box - (eoBF< const M &, const M::EOType &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex index 9437723d9..1de062a76 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex @@ -8,7 +8,7 @@ Class describing a solution tabu list with limited length. Inheritance diagram for moSimpleSolutionTabuList$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_simple_solution_tabu_list} +\includegraphics[height=2cm]{classmo_simple_solution_tabu_list} \end{center} \end{figure} \subsection*{Public Types} @@ -80,7 +80,7 @@ References moSimpleSolutionTabuList$<$ M $>$::currentSize. \subsection{Member Function Documentation} \index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!operator()@{operator()}} \index{operator()@{operator()}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleSolutionTabuList}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleSolutionTabuList}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047} Function that indicates if, in a given state, the \_\-move is tabu or not. @@ -94,8 +94,6 @@ Function that indicates if, in a given state, the \_\-move is tabu or not. \item[Returns:]true or false. \end{Desc} -Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}. - Definition at line 45 of file moSimpleSolutionTabuList.h. References moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!add@{add}} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps index c2a7fb9ca..34ec5563d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 441.989 +%%BoundingBox: 0 0 500 48.3092 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 10.35 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def -/cols 1 def +/rows 2 def +/cols 4 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,9 +174,10 @@ boxfont setfont 1 boundaspect scale (moSolContinue< EOT >) cw -(eoUF< const EOT &, bool >) cw -(eoFunctorBase) cw +(moFitSolContinue< EOT >) cw (moGenSolContinue< EOT >) cw +(moNoFitImprSolContinue< EOT >) cw +(moSteadyFitSolContinue< EOT >) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,22 +189,23 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moSolContinue< EOT >) 0 1 box - (eoUF< const EOT &, bool >) 0 2 box - (eoFunctorBase) 0 3 box - (moGenSolContinue< EOT >) 0 0 box + (moSolContinue< EOT >) 1.5 1 box + (moFitSolContinue< EOT >) 0 0 box + (moGenSolContinue< EOT >) 1 0 box + (moNoFitImprSolContinue< EOT >) 2 0 box + (moSteadyFitSolContinue< EOT >) 3 0 box % ----- relations ----- solid -0 0 1 out +1 1.5 0.25 out solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in -solid -1 0 0.25 out +0 3 1 conn solid 0 0 0.75 in +solid +0 1 0.75 in +solid +0 2 0.75 in +solid +0 3 0.75 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex index bc98d68d9..a4f7f0a52 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex @@ -8,7 +8,7 @@ Class that describes a stop criterion for a solution-based heuristic. Inheritance diagram for moSolContinue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_sol_continue} +\includegraphics[height=1.35266cm]{classmo_sol_continue} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -23,7 +23,7 @@ virtual void {\bf init} ()=0 Class that describes a stop criterion for a solution-based heuristic. -It allows to add an initialisation procedure to an object that is a unary function ({\bf eoUF}). +It allows to add an initialisation procedure to an object that is a unary function (eoUF). @@ -39,7 +39,7 @@ Procedure which initialises all that the stop criterion needs. Generally, it allocates some data structures or initialises some counters. -Implemented in {\bf moGenSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}. +Implemented in {\bf moFitSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c}, {\bf moGenSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}, {\bf moNoFitImprSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4}, and {\bf moSteadyFitSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex index 5a4f980aa..43efce92e 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex @@ -1,11 +1,11 @@ -\section{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$ Class Template Reference} +\section{moSteadyFitSolContinue$<$ EOT $>$ Class Template Reference} \label{classmo_steady_fit_sol_continue}\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}} One possible stopping criterion for a solution-based heuristic. -{\tt \#include $<$mo\-Steady\-Fit\-Sol\-Continue.h$>$} +{\tt \#include $<$moSteadyFitSolContinue.h$>$} -Inheritance diagram for mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for moSteadyFitSolContinue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=2cm]{classmo_steady_fit_sol_continue} @@ -14,43 +14,43 @@ Inheritance diagram for mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure \subsection*{Public Types} \begin{CompactItemize} \item -typedef EOT::Fitness \bf{Fitness}\label{classmo_steady_fit_sol_continue_c289721abbbafe50f6e3b8305dd31007} +typedef EOT::Fitness {\bf Fitness}\label{classmo_steady_fit_sol_continue_c289721abbbafe50f6e3b8305dd31007} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -\bf{mo\-Steady\-Fit\-Sol\-Continue} (unsigned int \_\-\_\-max\-Number\-Of\-Iterations, unsigned int \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement) +{\bf moSteadyFitSolContinue} (unsigned int \_\-\_\-maxNumberOfIterations, unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovement) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item -bool \bf{operator()} (const EOT \&\_\-\_\-sol) +bool {\bf operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item -void \bf{init} () +void {\bf init} () \begin{CompactList}\small\item\em Procedure which allows to initialise the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int \bf{max\-Number\-Of\-Iterations}\label{classmo_steady_fit_sol_continue_36b43c2a252887ad027165ac32393fe8} +unsigned int {\bf maxNumberOfIterations}\label{classmo_steady_fit_sol_continue_36b43c2a252887ad027165ac32393fe8} \begin{CompactList}\small\item\em Maximum number of iterations before considering the fitness. \item\end{CompactList}\item -unsigned int \bf{max\-Number\-Of\-Iterations\-Without\-Improvement}\label{classmo_steady_fit_sol_continue_cde593c09f497a5fa66ff62732544f40} +unsigned int {\bf maxNumberOfIterationsWithoutImprovement}\label{classmo_steady_fit_sol_continue_cde593c09f497a5fa66ff62732544f40} \begin{CompactList}\small\item\em Maximum number of iterations without improvement allowed. \item\end{CompactList}\item -bool \bf{max\-Number\-Of\-Iterations\-Reached}\label{classmo_steady_fit_sol_continue_7d88c0eb91b2a12121ba1c3ae9139887} +bool {\bf maxNumberOfIterationsReached}\label{classmo_steady_fit_sol_continue_7d88c0eb91b2a12121ba1c3ae9139887} -\begin{CompactList}\small\item\em Flag that indicates that the max\-Number\-Iteration have been reached. \item\end{CompactList}\item -bool \bf{first\-Fitness\-Saved}\label{classmo_steady_fit_sol_continue_025bf2789e470fdde989eee9121035c3} +\begin{CompactList}\small\item\em Flag that indicates that the maxNumberIteration have been reached. \item\end{CompactList}\item +bool {\bf firstFitnessSaved}\label{classmo_steady_fit_sol_continue_025bf2789e470fdde989eee9121035c3} \begin{CompactList}\small\item\em Flag that this is the first time that the fitness is used. \item\end{CompactList}\item -\bf{Fitness} \bf{fitness}\label{classmo_steady_fit_sol_continue_a5c62e7049b36f6e71e92b559568c09e} +{\bf Fitness} {\bf fitness}\label{classmo_steady_fit_sol_continue_a5c62e7049b36f6e71e92b559568c09e} \begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item -unsigned int \bf{counter}\label{classmo_steady_fit_sol_continue_245c9099a2c40dfc4f34b3ff216d13ce} +unsigned int {\bf counter}\label{classmo_steady_fit_sol_continue_245c9099a2c40dfc4f34b3ff216d13ce} \begin{CompactList}\small\item\em The iteration couter. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class moSteadyFitSolContinue$<$ EOT $>$} One possible stopping criterion for a solution-based heuristic. @@ -58,12 +58,12 @@ The stop criterion corresponds to a maximum number of iterations without improve -Definition at line 21 of file mo\-Steady\-Fit\-Sol\-Continue.h. +Definition at line 21 of file moSteadyFitSolContinue.h. \subsection{Constructor \& Destructor Documentation} -\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} -\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Steady\-Fit\-Sol\-Continue} (unsigned int {\em \_\-\_\-max\-Number\-Of\-Iterations}, unsigned int {\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_5f50fb18e380230e37301f33319786a4} +\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} +\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moSteadyFitSolContinue}$<$ EOT $>$::{\bf moSteadyFitSolContinue} (unsigned int {\em \_\-\_\-maxNumberOfIterations}, unsigned int {\em \_\-\_\-maxNumberOfIterationWithoutImprovement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_5f50fb18e380230e37301f33319786a4} Basic constructor. @@ -71,16 +71,16 @@ Basic constructor. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-max\-Number\-Of\-Iterations}]The number of iterations to reach before looking for the fitness. \item[{\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement}]The number of iterations without fitness improvement to reach for stop. \end{description} +\item[{\em \_\-\_\-maxNumberOfIterations}]The number of iterations to reach before looking for the fitness. \item[{\em \_\-\_\-maxNumberOfIterationWithoutImprovement}]The number of iterations without fitness improvement to reach for stop. \end{description} \end{Desc} -Definition at line 34 of file mo\-Steady\-Fit\-Sol\-Continue.h. +Definition at line 34 of file moSteadyFitSolContinue.h. \subsection{Member Function Documentation} -\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!operator()@{operator()}} -\index{operator()@{operator()}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_942e58ec00bb61000a83c80176e14bc3} +\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!operator()@{operator()}} +\index{operator()@{operator()}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moSteadyFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_942e58ec00bb61000a83c80176e14bc3} Function that activates the stopping criterion. @@ -96,23 +96,23 @@ Indicates if the fitness has not been improved since a number of iterations (aft \item[Returns:]true or false. \end{Desc} -Definition at line 46 of file mo\-Steady\-Fit\-Sol\-Continue.h. +Definition at line 46 of file moSteadyFitSolContinue.h. -References mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::counter, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::fitness, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Reached, and mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Without\-Improvement.\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!init@{init}} -\index{init@{init}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9} +References moSteadyFitSolContinue$<$ EOT $>$::counter, moSteadyFitSolContinue$<$ EOT $>$::firstFitnessSaved, moSteadyFitSolContinue$<$ EOT $>$::fitness, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterations, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsReached, and moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement.\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!init@{init}} +\index{init@{init}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moSteadyFitSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9} Procedure which allows to initialise the stuff needed. It can be also used to reinitialize the counter all the needed things. -Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. +Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. -Definition at line 90 of file mo\-Steady\-Fit\-Sol\-Continue.h. +Definition at line 90 of file moSteadyFitSolContinue.h. -References mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::counter, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, and mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Reached. +References moSteadyFitSolContinue$<$ EOT $>$::counter, moSteadyFitSolContinue$<$ EOT $>$::firstFitnessSaved, and moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsReached. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Steady\-Fit\-Sol\-Continue.h\end{CompactItemize} +moSteadyFitSolContinue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps b/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps index a62652ad5..7f23b6aef 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 271.739 +%%BoundingBox: 0 0 500 268.456 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def -/cols 2 def +/rows 2 def +/cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,10 +175,6 @@ boxfont setfont 1 boundaspect scale (moTS< M >) cw (moAlgo< M::EOType >) cw -(eoMonOp< M::EOType >) cw -(eoOp< EOType >) cw -(eoUF< M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,32 +186,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moTS< M >) 0.5 0 box - (moAlgo< M::EOType >) 0.5 1 box - (eoMonOp< M::EOType >) 0.5 2 box - (eoOp< EOType >) 0 3 box - (eoUF< M::EOType &, bool >) 1 3 box - (eoFunctorBase) 1 4 box + (moTS< M >) 0 0 box + (moAlgo< M::EOType >) 0 1 box % ----- relations ----- solid -0 0.5 0 out +0 0 0 out solid -1 0.5 1 in -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -0 1 3 conn -solid -1 0 3 in -solid -1 1 3 in -solid -0 1 3 out -solid -1 1 4 in +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex b/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex index 28299680d..cceaa8d92 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex @@ -8,15 +8,15 @@ Tabu Search (TS). Inheritance diagram for moTS$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=5cm]{classmo_t_s} +\includegraphics[height=2cm]{classmo_t_s} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moTabuList}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moTabuList}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item -{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Constructor with less parameters. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize} @@ -38,7 +38,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f8 {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a} \begin{CompactList}\small\item\em Stop criterion. \item\end{CompactList}\item -{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} +eoEvalFunc$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} \begin{CompactList}\small\item\em Full evaluation function. \item\end{CompactList}\end{CompactItemize} @@ -57,7 +57,7 @@ Definition at line 29 of file moTS.h. \subsection{Constructor \& Destructor Documentation} \index{moTS@{moTS}!moTS@{moTS}} \index{moTS@{moTS}!moTS@{moTS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes. @@ -73,7 +73,7 @@ In this constructor, a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl Definition at line 58 of file moTS.h.\index{moTS@{moTS}!moTS@{moTS}} \index{moTS@{moTS}!moTS@{moTS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} Constructor with less parameters. @@ -92,7 +92,7 @@ Definition at line 71 of file moTS.h. \subsection{Member Function Documentation} \index{moTS@{moTS}!operator()@{operator()}} \index{operator()@{operator()}!moTS@{moTS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moTS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moTS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} Function which launchs the Tabu Search. @@ -108,8 +108,6 @@ Algorithm of the tabu search. As a \doxyref{moSA}{p.}{classmo_s_a} or a \doxyref \item[Returns:]TRUE. \end{Desc} -Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. - Definition at line 85 of file moTS.h. References moTS$<$ M $>$::cont, moTS$<$ M $>$::full\_\-eval, and moTS$<$ M $>$::move\_\-expl. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps index fd31fc02a..d8324527a 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 327.869 +%%BoundingBox: 0 0 500 352.941 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.41667 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -176,8 +176,6 @@ boxfont setfont (moTSMoveLoopExpl< M >) cw (moMoveLoopExpl< M >) cw (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale (moTSMoveLoopExpl< M >) 0 0 box (moMoveLoopExpl< M >) 0 1 box (moMoveExpl< M >) 0 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0 3 box - (eoFunctorBase) 0 4 box % ----- relations ----- @@ -205,11 +201,3 @@ solid 0 0 1 out solid 1 0 2 in -solid -0 0 2 out -solid -1 0 3 in -solid -0 0 3 out -solid -1 0 4 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex index 2a5d367c6..5960c57c6 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex @@ -8,7 +8,7 @@ Explorer for a Tabu Search algorithm. Inheritance diagram for moTSMoveLoopExpl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=5cm]{classmo_t_s_move_loop_expl} +\includegraphics[height=3cm]{classmo_t_s_move_loop_expl} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -83,7 +83,7 @@ References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, and moTSMoveLoopExpl$<$ M $ \subsection{Member Function Documentation} \index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!operator()@{operator()}} \index{operator()@{operator()}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moTSMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moTSMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} Procedure which lauches the exploration. @@ -97,8 +97,6 @@ The exploration continues while the chosen move is not in the tabu list or the a \end{Desc} -Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}. - Definition at line 69 of file moTSMoveLoopExpl.h. References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, moTSMoveLoopExpl$<$ M $>$::incr\_\-eval, moTSMoveLoopExpl$<$ M $>$::move\_\-init, moTSMoveLoopExpl$<$ M $>$::move\_\-select, moTSMoveLoopExpl$<$ M $>$::next\_\-move, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps index 2aee2f1b6..63ca07c99 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 138.889 +%%BoundingBox: 0 0 500 100 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 3.6 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 5 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw -(eoFunctorBase) cw (moSimpleMoveTabuList< M >) cw (moSimpleSolutionTabuList< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -190,21 +188,11 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moTabuList< M >) 0.5 1 box - (eoBF< const M &, const M::EOType &, bool >) 0.5 2 box - (eoFunctorBase) 0.5 3 box (moSimpleMoveTabuList< M >) 0 0 box (moSimpleSolutionTabuList< M >) 1 0 box % ----- relations ----- -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -1 0.5 3 in solid 1 0.5 0.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex index 1ed7c1b47..5cc19f839 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex @@ -8,7 +8,7 @@ Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses. Inheritance diagram for moTabuList$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3.88889cm]{classmo_tabu_list} +\includegraphics[height=2cm]{classmo_tabu_list} \end{center} \end{figure} \subsection*{Public Types} @@ -65,7 +65,7 @@ Procedure that updates the tabu list content. Generally, a counter associated to each saved move is decreased by one. -Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}.\index{moTabuList@{moTabuList}!init@{init}} +Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}, and {\bf TwoOptTabuList} \doxyref{}{p.}{class_two_opt_tabu_list_c460034b7debe7198c6df046855155da}.\index{moTabuList@{moTabuList}!init@{init}} \index{init@{init}!moTabuList@{moTabuList}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57} @@ -74,7 +74,7 @@ Procedure which initialises the tabu list. Can be useful if the data structure needs to be allocated before being used. -Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}. +Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}, and {\bf TwoOptTabuList} \doxyref{}{p.}{class_two_opt_tabu_list_2d3101e6045700b0e32f5e82672a175e}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/doxygen.sty b/trunk/paradiseo-mo/doc/latex/doxygen.sty index cca9cf2eb..380517dc0 100644 --- a/trunk/paradiseo-mo/doc/latex/doxygen.sty +++ b/trunk/paradiseo-mo/doc/latex/doxygen.sty @@ -10,8 +10,8 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by Doxygen }} \cfoot{} \newenvironment{Code} {\footnotesize} diff --git a/trunk/paradiseo-mo/doc/latex/hierarchy.tex b/trunk/paradiseo-mo/doc/latex/hierarchy.tex index 66deba8dc..018b31b01 100644 --- a/trunk/paradiseo-mo/doc/latex/hierarchy.tex +++ b/trunk/paradiseo-mo/doc/latex/hierarchy.tex @@ -1,28 +1,36 @@ -\section{PARADISEO-MO Class Hierarchy} +\section{ParadisEO-MOMovingObjects Class Hierarchy} This inheritance list is sorted roughly, but not completely, alphabetically:\begin{CompactList} +\item \contentsline{section}{CitySwap}{\pageref{class_city_swap}}{} +\item \contentsline{section}{EdgeXover}{\pageref{class_edge_xover}}{} \item \contentsline{section}{EmptySelection}{\pageref{class_empty_selection}}{} -\item eoFunctorBase{\tt [external]}\begin{CompactList} -\item eoBF$<$ const M \&, const M::EOType \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moTabuList$<$ M $>$}{\pageref{classmo_tabu_list}}{} +\item \contentsline{section}{moAlgo$<$ EOT $>$}{\pageref{classmo_algo}}{} +\item \contentsline{section}{moAlgo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} \begin{CompactList} -\item \contentsline{section}{moSimpleMoveTabuList$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{} -\item \contentsline{section}{moSimpleSolutionTabuList$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{} +\item \contentsline{section}{moHC$<$ M $>$}{\pageref{classmo_h_c}}{} +\item \contentsline{section}{moILS$<$ M $>$}{\pageref{classmo_i_l_s}}{} +\item \contentsline{section}{moSA$<$ M $>$}{\pageref{classmo_s_a}}{} +\item \contentsline{section}{moTS$<$ M $>$}{\pageref{classmo_t_s}}{} \end{CompactList} -\end{CompactList} -\item eoBF$<$ const M \&, const M::EOType \&, M::EOType::Fitness $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMoveIncrEval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{} -\end{CompactList} -\item eoBF$<$ const M \&, const M::EOType \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moLSCheckPoint$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} -\end{CompactList} -\item eoBF$<$ const M \&, const M::EOType::Fitness \&, bool $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{moAspirCrit$<$ M $>$}{\pageref{classmo_aspir_crit}}{} \begin{CompactList} \item \contentsline{section}{moImprBestFitAspirCrit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{} \item \contentsline{section}{moNoAspirCrit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{} \end{CompactList} +\item \contentsline{section}{moComparator$<$ EOT $>$}{\pageref{classmo_comparator}}{} +\begin{CompactList} +\item \contentsline{section}{moFitComparator$<$ EOT $>$}{\pageref{classmo_fit_comparator}}{} +\end{CompactList} +\item \contentsline{section}{moCoolingSchedule}{\pageref{classmo_cooling_schedule}}{} +\begin{CompactList} +\item \contentsline{section}{moExponentialCoolingSchedule}{\pageref{classmo_exponential_cooling_schedule}}{} +\item \contentsline{section}{moLinearCoolingSchedule}{\pageref{classmo_linear_cooling_schedule}}{} +\end{CompactList} +\item \contentsline{section}{moLSCheckPoint$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} +\item \contentsline{section}{moMove$<$ EOT $>$}{\pageref{classmo_move}}{} +\item \contentsline{section}{moMove$<$ Route $>$}{\pageref{classmo_move}}{} +\begin{CompactList} +\item \contentsline{section}{TwoOpt}{\pageref{class_two_opt}}{} \end{CompactList} -\item eoBF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{moMoveExpl$<$ M $>$}{\pageref{classmo_move_expl}}{} \begin{CompactList} \item \contentsline{section}{moMoveLoopExpl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{} @@ -31,59 +39,56 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg \item \contentsline{section}{moTSMoveLoopExpl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{} \end{CompactList} \end{CompactList} -\end{CompactList} -\item eoBF$<$ M \&, const M::EOType \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moNextMove$<$ M $>$}{\pageref{classmo_next_move}}{} +\item \contentsline{section}{moMoveIncrEval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{} +\item \contentsline{section}{moMoveIncrEval$<$ TwoOpt $>$}{\pageref{classmo_move_incr_eval}}{} \begin{CompactList} -\item \contentsline{section}{moItRandNextMove$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} +\item \contentsline{section}{TwoOptIncrEval}{\pageref{class_two_opt_incr_eval}}{} \end{CompactList} -\end{CompactList} -\item eoBF$<$ M \&, const M::EOType \&, void $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{moMoveInit$<$ M $>$}{\pageref{classmo_move_init}}{} +\item \contentsline{section}{moMoveInit$<$ TwoOpt $>$}{\pageref{classmo_move_init}}{} +\begin{CompactList} +\item \contentsline{section}{PartTwoOptInit}{\pageref{class_part_two_opt_init}}{} +\item \contentsline{section}{TwoOptInit}{\pageref{class_two_opt_init}}{} \end{CompactList} -\item eoBF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{moMoveSelect$<$ M $>$}{\pageref{classmo_move_select}}{} \begin{CompactList} \item \contentsline{section}{moBestImprSelect$<$ M $>$}{\pageref{classmo_best_impr_select}}{} \item \contentsline{section}{moFirstImprSelect$<$ M $>$}{\pageref{classmo_first_impr_select}}{} \item \contentsline{section}{moRandImprSelect$<$ M $>$}{\pageref{classmo_rand_impr_select}}{} \end{CompactList} +\item \contentsline{section}{moNextMove$<$ M $>$}{\pageref{classmo_next_move}}{} +\begin{CompactList} +\item \contentsline{section}{moItRandNextMove$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} +\end{CompactList} +\item \contentsline{section}{moNextMove$<$ TwoOpt $>$}{\pageref{classmo_next_move}}{} +\begin{CompactList} +\item \contentsline{section}{PartTwoOptNext}{\pageref{class_part_two_opt_next}}{} +\item \contentsline{section}{TwoOptNext}{\pageref{class_two_opt_next}}{} +\end{CompactList} +\item \contentsline{section}{moRandMove$<$ M $>$}{\pageref{classmo_rand_move}}{} +\item \contentsline{section}{moRandMove$<$ TwoOpt $>$}{\pageref{classmo_rand_move}}{} +\begin{CompactList} +\item \contentsline{section}{TwoOptRand}{\pageref{class_two_opt_rand}}{} \end{CompactList} -\item eoUF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{moSolContinue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{} \begin{CompactList} +\item \contentsline{section}{moFitSolContinue$<$ EOT $>$}{\pageref{classmo_fit_sol_continue}}{} \item \contentsline{section}{moGenSolContinue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} +\item \contentsline{section}{moNoFitImprSolContinue$<$ EOT $>$}{\pageref{classmo_no_fit_impr_sol_continue}}{} +\item \contentsline{section}{moSteadyFitSolContinue$<$ EOT $>$}{\pageref{classmo_steady_fit_sol_continue}}{} \end{CompactList} -\end{CompactList} -\item eoUF$<$ double \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moCoolingSchedule}{\pageref{classmo_cooling_schedule}}{} +\item \contentsline{section}{moTabuList$<$ M $>$}{\pageref{classmo_tabu_list}}{} \begin{CompactList} -\item \contentsline{section}{moExponentialCoolingSchedule}{\pageref{classmo_exponential_cooling_schedule}}{} -\item \contentsline{section}{moLinearCoolingSchedule}{\pageref{classmo_linear_cooling_schedule}}{} +\item \contentsline{section}{moSimpleMoveTabuList$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{} +\item \contentsline{section}{moSimpleSolutionTabuList$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{} \end{CompactList} -\end{CompactList} -\item eoUF$<$ EOT \&, bool $>${\tt [external]}\begin{CompactList} -\item eoMonOp$<$ EOT $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moAlgo$<$ EOT $>$}{\pageref{classmo_algo}}{} -\end{CompactList} -\end{CompactList} -\item eoUF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMove$<$ EOT $>$}{\pageref{classmo_move}}{} -\end{CompactList} -\item eoUF$<$ EOType \&, bool $>${\tt [external]}\item eoUF$<$ M \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moRandMove$<$ M $>$}{\pageref{classmo_rand_move}}{} -\end{CompactList} -\item eoUF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList} -\item eoMonOp$<$ M::EOType $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moAlgo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} +\item \contentsline{section}{moTabuList$<$ TwoOpt $>$}{\pageref{classmo_tabu_list}}{} \begin{CompactList} -\item \contentsline{section}{moHC$<$ M $>$}{\pageref{classmo_h_c}}{} -\item \contentsline{section}{moSA$<$ M $>$}{\pageref{classmo_s_a}}{} -\item \contentsline{section}{moTS$<$ M $>$}{\pageref{classmo_t_s}}{} +\item \contentsline{section}{TwoOptTabuList}{\pageref{class_two_opt_tabu_list}}{} \end{CompactList} -\end{CompactList} -\end{CompactList} -\end{CompactList} -\item eoOp$<$ EOType $>${\tt [external]}\begin{CompactList} -\item eoMonOp$<$ EOT $>${\tt [external]}\item eoMonOp$<$ M::EOType $>${\tt [external]}\end{CompactList} +\item \contentsline{section}{OrderXover}{\pageref{class_order_xover}}{} +\item \contentsline{section}{PartialMappedXover}{\pageref{class_partial_mapped_xover}}{} +\item \contentsline{section}{PartRouteEval}{\pageref{class_part_route_eval}}{} +\item \contentsline{section}{RouteEval}{\pageref{class_route_eval}}{} +\item \contentsline{section}{RouteInit}{\pageref{class_route_init}}{} \end{CompactList} diff --git a/trunk/paradiseo-mo/doc/latex/main.tex b/trunk/paradiseo-mo/doc/latex/main.tex index 8dba03e9c..3ce1b6114 100644 --- a/trunk/paradiseo-mo/doc/latex/main.tex +++ b/trunk/paradiseo-mo/doc/latex/main.tex @@ -1,5 +1,5 @@ -\section{intro}\label{main_intro} -MO is an extension of the ANSI-C++ compliant evolutionary computation library {\bf EO}. \par - It contains classes for almost any kind of one solution based heuristics.\section{tutorial}\label{main_tutorial} -\section{install}\label{main_install} -The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.\section{design}\label{main_design} +\section{Introduction}\label{main_intro} +MO is an extension of the ANSI-C++ compliant evolutionary computation library EO. \par + It contains classes for almost any kind of one solution based heuristics.\section{Tutorial}\label{main_tutorial} +\section{Installation}\label{main_install} +The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.\section{Overall Design}\label{main_design} diff --git a/trunk/paradiseo-mo/doc/latex/namespace_graph.tex b/trunk/paradiseo-mo/doc/latex/namespace_graph.tex new file mode 100644 index 000000000..c4e7f4315 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/namespace_graph.tex @@ -0,0 +1,28 @@ +\section{Graph Namespace Reference} +\label{namespace_graph}\index{Graph@{Graph}} + + +\subsection*{Functions} +\begin{CompactItemize} +\item +unsigned {\bf size} ()\label{namespace_graph_28d00fd97d57e79738e7df7ba8214f5c} + +\item +void {\bf computeDistances} ()\label{namespace_graph_517d15215e1529a6585e15949f29c326} + +\item +void {\bf load} (const char $\ast$\_\-\_\-fileName)\label{namespace_graph_95f0bc08fa93f8f4abf1801674488b30} + +\item +float {\bf distance} (unsigned int \_\-\_\-from, unsigned int \_\-\_\-to)\label{namespace_graph_510a8b9e849ec2c3241a09cac9d45cc6} + +\end{CompactItemize} +\subsection*{Variables} +\begin{CompactItemize} +\item +static std::vector$<$ std::pair$<$ double, double $>$ $>$ {\bf vectCoord}\label{namespace_graph_4199f2387f0cda6c75804c94b635e24c} + +\item +static std::vector$<$ std::vector$<$ unsigned int $>$ $>$ {\bf dist}\label{namespace_graph_c1316f71ab101e1f63eecd81a8d7a400} + +\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/namespaces.tex b/trunk/paradiseo-mo/doc/latex/namespaces.tex new file mode 100644 index 000000000..dda2d6978 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/namespaces.tex @@ -0,0 +1,4 @@ +\section{ParadisEO-MOMovingObjects Namespace List} +Here is a list of all documented namespaces with brief descriptions:\begin{CompactList} +\item\contentsline{section}{{\bf Graph} }{\pageref{namespace_graph}}{} +\end{CompactList} diff --git a/trunk/paradiseo-mo/doc/latex/refman.tex b/trunk/paradiseo-mo/doc/latex/refman.tex index 8bfca074c..08441c13f 100644 --- a/trunk/paradiseo-mo/doc/latex/refman.tex +++ b/trunk/paradiseo-mo/doc/latex/refman.tex @@ -16,11 +16,11 @@ \begin{titlepage} \vspace*{7cm} \begin{center} -{\Large PARADISEO-MO Reference Manual\\[1ex]\large 0.1 }\\ +{\Large ParadisEO-MOMovingObjects Reference Manual\\[1ex]\large 1.0 }\\ \vspace*{1cm} {\large Generated by Doxygen 1.5.2}\\ \vspace*{0.5cm} -{\small Fri Jul 6 17:23:18 2007}\\ +{\small Thu Sep 20 11:30:28 2007}\\ \end{center} \end{titlepage} \clearemptydoublepage @@ -30,21 +30,31 @@ \pagenumbering{arabic} \chapter{Welcome to PARADISEO-Moving Objects } \label{index}\input{main} -\chapter{PARADISEO-MO Hierarchical Index} +\chapter{ParadisEO-MOMovingObjects Namespace Index} +\input{namespaces} +\chapter{ParadisEO-MOMovingObjects Hierarchical Index} \input{hierarchy} -\chapter{PARADISEO-MO Class Index} +\chapter{ParadisEO-MOMovingObjects Class Index} \input{annotated} -\chapter{PARADISEO-MO Class Documentation} -\input{class_empty_selection} +\chapter{ParadisEO-MOMovingObjects Namespace Documentation} +\input{namespace_graph} +\chapter{ParadisEO-MOMovingObjects Class Documentation} +\input{class_city_swap} +\include{class_edge_xover} +\include{class_empty_selection} \include{classmo_algo} \include{classmo_aspir_crit} \include{classmo_best_impr_select} +\include{classmo_comparator} \include{classmo_cooling_schedule} \include{classmo_exponential_cooling_schedule} \include{classmo_first_impr_select} +\include{classmo_fit_comparator} +\include{classmo_fit_sol_continue} \include{classmo_gen_sol_continue} \include{classmo_h_c} \include{classmo_h_c_move_loop_expl} +\include{classmo_i_l_s} \include{classmo_impr_best_fit_aspir_crit} \include{classmo_it_rand_next_move} \include{classmo_linear_cooling_schedule} @@ -57,14 +67,29 @@ \include{classmo_move_select} \include{classmo_next_move} \include{classmo_no_aspir_crit} +\include{classmo_no_fit_impr_sol_continue} \include{classmo_rand_impr_select} \include{classmo_rand_move} \include{classmo_s_a} \include{classmo_simple_move_tabu_list} \include{classmo_simple_solution_tabu_list} \include{classmo_sol_continue} +\include{classmo_steady_fit_sol_continue} \include{classmo_tabu_list} \include{classmo_t_s} \include{classmo_t_s_move_loop_expl} +\include{class_order_xover} +\include{class_partial_mapped_xover} +\include{class_part_route_eval} +\include{class_part_two_opt_init} +\include{class_part_two_opt_next} +\include{class_route_eval} +\include{class_route_init} +\include{class_two_opt} +\include{class_two_opt_incr_eval} +\include{class_two_opt_init} +\include{class_two_opt_next} +\include{class_two_opt_rand} +\include{class_two_opt_tabu_list} \printindex \end{document} diff --git a/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 b/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 index 775ecd2a0..b180dac12 100644 --- a/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 +++ b/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 @@ -1,4 +1,4 @@ -.TH "EmptySelection" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "EmptySelection" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -20,4 +20,4 @@ Definition at line 21 of file moMoveSelect.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 b/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 index 5f53fcb2f..7c804c380 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 @@ -1,4 +1,4 @@ -.TH "moAlgo" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAlgo" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moAlgo \- Description of an algorithm of the paradiseo-mo library. .PP \fC#include \fP .PP -Inherits \fBeoMonOp< EOT >\fP. -.PP .SH "Detailed Description" .PP @@ -24,4 +22,4 @@ Definition at line 21 of file moAlgo.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 index 2b6d6d7b9..557c88d1a 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moAspirCrit" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAspirCrit" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moAspirCrit \- Description of the conditions in which a tabu move could be accep .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP. -.PP Inherited by \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP. .PP .SS "Public Member Functions" @@ -43,4 +41,4 @@ Implemented in \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 index d8749d1a2..6a8550809 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moBestImprSelect" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moBestImprSelect" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -88,7 +88,7 @@ Implements \fBmoMoveSelect< M >\fP. Definition at line 47 of file moBestImprSelect.h. .PP References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. -.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" +.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" .PP Procedure which saved the best move and fitness. .PP @@ -105,8 +105,6 @@ Procedure which saved the best move and fitness. .RE .PP -.PP -Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 68 of file moBestImprSelect.h. .PP @@ -114,4 +112,4 @@ References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, an .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 index 1a4aa6538..f8eb17ebe 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moCoolingSchedule" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moCoolingSchedule" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moCoolingSchedule \- This class gives the description of a cooling schedule. .PP \fC#include \fP .PP -Inherits \fBeoUF< double &, bool >\fP. -.PP Inherited by \fBmoExponentialCoolingSchedule\fP, and \fBmoLinearCoolingSchedule\fP. .PP .SH "Detailed Description" @@ -24,4 +22,4 @@ Definition at line 22 of file moCoolingSchedule.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 index 0879a5d03..f5b65f427 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moExponentialCoolingSchedule" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moExponentialCoolingSchedule" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -61,7 +61,7 @@ Simple constructor. Definition at line 31 of file moExponentialCoolingSchedule.h. .SH "Member Function Documentation" .PP -.SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP" +.SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline]\fP" .PP Function which proceeds to the cooling. .PP @@ -78,8 +78,6 @@ if the new temperature (current temperature * ratio) is greater than the thresho .RE .PP -.PP -Implements \fBeoUF< double &, bool >\fP. .PP Definition at line 41 of file moExponentialCoolingSchedule.h. .PP @@ -87,4 +85,4 @@ References ratio, and threshold. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 index 718b000a1..dda667197 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moFirstImprSelect" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFirstImprSelect" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -101,7 +101,7 @@ TRUE if the move does not improve the fitness. Definition at line 52 of file moFirstImprSelect.h. .PP References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid. -.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" +.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" .PP Procedure which saved the best move and fitness. .PP @@ -118,8 +118,6 @@ Procedure which saved the best move and fitness. .RE .PP -.PP -Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 76 of file moFirstImprSelect.h. .PP @@ -127,4 +125,4 @@ References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 index c2b285459..fb7562987 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moFitSolContinue" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFitSolContinue" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -102,4 +102,4 @@ Definition at line 57 of file moFitSolContinue.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 index 9f61aa6ed..d071e1b7d 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moGenSolContinue" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moGenSolContinue" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -65,7 +65,7 @@ Simple constructor. Definition at line 30 of file moGenSolContinue.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline]\fP" .PP Function that activates the stop criterion. .PP @@ -82,8 +82,6 @@ TRUE or FALSE according to the current generation number. .RE .PP -.PP -Implements \fBeoUF< const EOT &, bool >\fP. .PP Definition at line 44 of file moGenSolContinue.h. .PP @@ -102,4 +100,4 @@ References moGenSolContinue< EOT >::numGen. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moHC.3 b/trunk/paradiseo-mo/doc/man/man3/moHC.3 index 70f1222c8..1d1f713c7 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moHC.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moHC.3 @@ -1,4 +1,4 @@ -.TH "moHC" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHC" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,11 +16,11 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoMoveSelect\fP< M > &__move_select, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoMoveSelect\fP< M > &__move_select, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fIFull constructor. \fP" .ti -1c -.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &__move_expl, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fILight constructor. \fP" .ti -1c @@ -48,7 +48,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIComplete exploration of the neighborhood. \fP" .ti -1c -.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" +.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIA full evaluation function. \fP" .in -1c @@ -63,7 +63,7 @@ Class which describes the algorithm for a hill climbing. Definition at line 26 of file moHC.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Full constructor. .PP @@ -85,7 +85,7 @@ All the boxes are given in order the HC to use a \fBmoHCMoveLoopExpl\fP. .PP Definition at line 53 of file moHC.h. -.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Light constructor. .PP @@ -103,7 +103,7 @@ This constructor allow to use another \fBmoMoveExpl\fP (generally not a \fBmoHCM Definition at line 67 of file moHC.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" .PP Function which launches the HC. .PP @@ -120,8 +120,6 @@ TRUE. .RE .PP -.PP -Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 82 of file moHC.h. .PP @@ -129,4 +127,4 @@ References moHC< M >::full_eval, and moHC< M >::move_expl. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 index fe9ac40f4..5e39357ce 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moHCMoveLoopExpl" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHCMoveLoopExpl" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -87,7 +87,7 @@ All the boxes have to be specified. Definition at line 43 of file moHCMoveLoopExpl.h. .SH "Member Function Documentation" .PP -.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP" +.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline]\fP" .PP Procedure which launches the explorer. .PP @@ -101,8 +101,6 @@ The exploration starts from an old solution and provides a new solution. .RE .PP -.PP -Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP. .PP Definition at line 59 of file moHCMoveLoopExpl.h. .PP @@ -110,4 +108,4 @@ References moHCMoveLoopExpl< M >::incr_eval, moHCMoveLoopExpl< M >::move_init, m .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 index fd6fbbde8..88bd421fa 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moImprBestFitAspirCrit" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moImprBestFitAspirCrit" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -59,7 +59,7 @@ This criterion is satisfied when a given fitness is the best ever considered. Definition at line 22 of file moImprBestFitAspirCrit.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & __move, const \fBFitness\fP & __fit)\fC [inline, virtual]\fP" +.SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & __move, const \fBFitness\fP & __fit)\fC [inline]\fP" .PP Function that indicates if the fit is better that the already saved fit. .PP @@ -78,8 +78,6 @@ TRUE the first time and if __fit > best_fit, else FALSE. .RE .PP -.PP -Implements \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP. .PP Definition at line 52 of file moImprBestFitAspirCrit.h. .PP @@ -87,4 +85,4 @@ References moImprBestFitAspirCrit< M >::best_fit, and moImprBestFitAspirCrit< M .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 index 056367846..1222715d9 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 @@ -1,4 +1,4 @@ -.TH "moItRandNextMove" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moItRandNextMove" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -63,7 +63,7 @@ Definition at line 22 of file moItRandNextMove.h. .PP The constructor. .PP -\fBParameters\fP only for initialising the attributes. +Parameters only for initialising the attributes. .PP \fBParameters:\fP .RS 4 @@ -77,7 +77,7 @@ The constructor. Definition at line 37 of file moItRandNextMove.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoItRandNextMove\fP< M >::operator() (M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoItRandNextMove\fP< M >::operator() (M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" .PP Generation of a new move. .PP @@ -96,8 +96,6 @@ FALSE if the maximum number of iteration is reached, else TRUE. .RE .PP -.PP -Implements \fBeoBF< M &, const M::EOType &, bool >\fP. .PP Definition at line 52 of file moItRandNextMove.h. .PP @@ -105,4 +103,4 @@ References moItRandNextMove< M >::max_iter, moItRandNextMove< M >::num_iter, and .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 index cb9dcfc4e..4f45f9ee7 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 @@ -1,4 +1,4 @@ -.TH "moLSCheckPoint" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLSCheckPoint" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moLSCheckPoint \- Class which allows a checkpointing system. .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, void >\fP. -.PP .SS "Public Member Functions" .in +1c @@ -20,7 +18,7 @@ Inherits \fBeoBF< const M &, const M::EOType &, void >\fP. .br .RI "\fIFunction which launches the checkpointing. \fP" .ti -1c -.RI "void \fBadd\fP (\fBeoBF\fP< const M &, const typename M::EOType &, void > &__f)" +.RI "void \fBadd\fP (eoBF< const M &, const typename M::EOType &, void > &__f)" .br .RI "\fIProcedure which add a new function to the function vector. \fP" .in -1c @@ -28,7 +26,7 @@ Inherits \fBeoBF< const M &, const M::EOType &, void >\fP. .in +1c .ti -1c -.RI "std::vector< \fBeoBF\fP< const M &, const typename M::EOType &, void > * > \fBfunc\fP" +.RI "std::vector< eoBF< const M &, const typename M::EOType &, void > * > \fBfunc\fP" .br .RI "\fIvector of function \fP" .in -1c @@ -61,7 +59,7 @@ Each saved function is used on the current move and the current solution. Definition at line 34 of file moLSCheckPoint.h. .PP References moLSCheckPoint< M >::func. -.SS "template void \fBmoLSCheckPoint\fP< M >::add (\fBeoBF\fP< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP" +.SS "template void \fBmoLSCheckPoint\fP< M >::add (eoBF< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP" .PP Procedure which add a new function to the function vector. .PP @@ -80,4 +78,4 @@ References moLSCheckPoint< M >::func. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 index d0879534f..c85b8d177 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moLinearCoolingSchedule" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLinearCoolingSchedule" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -61,7 +61,7 @@ Simple constructor. Definition at line 31 of file moLinearCoolingSchedule.h. .SH "Member Function Documentation" .PP -.SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP" +.SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline]\fP" .PP Function which proceeds to the cooling. .PP @@ -78,8 +78,6 @@ if the new temperature (current temperature - quantity) is greater than the thre .RE .PP -.PP -Implements \fBeoUF< double &, bool >\fP. .PP Definition at line 41 of file moLinearCoolingSchedule.h. .PP @@ -87,4 +85,4 @@ References quantity, and threshold. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMove.3 b/trunk/paradiseo-mo/doc/man/man3/moMove.3 index 3232ee1ce..ef64528a3 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMove.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMove.3 @@ -1,4 +1,4 @@ -.TH "moMove" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMove" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMove \- Definition of a move. .PP \fC#include \fP .PP -Inherits \fBeoUF< EOT &, void >\fP. -.PP .SS "Public Types" .in +1c @@ -32,4 +30,4 @@ Definition at line 23 of file moMove.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 index 6090b07c8..27b34bfd5 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveExpl" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveExpl" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveExpl \- Description of a move (\fBmoMove\fP) explorer. .PP \fC#include \fP .PP -Inherits \fBeoBF< const M::EOType &, M::EOType &, void >\fP. -.PP Inherited by \fBmoMoveLoopExpl< M >\fP. .PP .SH "Detailed Description" @@ -26,4 +24,4 @@ Definition at line 21 of file moMoveExpl.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 index e6263650a..b9cd0a2d6 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 @@ -1,4 +1,4 @@ -.TH "moMoveIncrEval" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveIncrEval" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveIncrEval \- (generally) Efficient evaluation function based a move and a s .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, M::EOType::Fitness >\fP. -.PP .SH "Detailed Description" .PP @@ -24,4 +22,4 @@ Definition at line 24 of file moMoveIncrEval.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 index c96403f6b..c137282c7 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 @@ -1,4 +1,4 @@ -.TH "moMoveInit" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveInit" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveInit \- Move (\fBmoMove\fP) initializer. .PP \fC#include \fP .PP -Inherits \fBeoBF< M &, const M::EOType &, void >\fP. -.PP .SH "Detailed Description" .PP @@ -24,4 +22,4 @@ Definition at line 22 of file moMoveInit.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 index 3c53f0b3a..ab1d57a2e 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveLoopExpl" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveLoopExpl" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -26,4 +26,4 @@ Definition at line 21 of file moMoveLoopExpl.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 index f01d62530..b7fc81be7 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 @@ -1,4 +1,4 @@ -.TH "moMoveSelect" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveSelect" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveSelect \- Class that describes a move selector (\fBmoMove\fP). .PP \fC#include \fP .PP -Inherits \fBeoBF< M &, M::EOType::Fitness &, void >\fP. -.PP Inherited by \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP. .PP .SS "Public Types" @@ -81,4 +79,4 @@ Implemented in \fBmoBestImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 index 4b70f19a3..e3fbfbc82 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 @@ -1,4 +1,4 @@ -.TH "moNextMove" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNextMove" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moNextMove \- Class which allows to generate a new move (\fBmoMove\fP). .PP \fC#include \fP .PP -Inherits \fBeoBF< M &, const M::EOType &, bool >\fP. -.PP Inherited by \fBmoItRandNextMove< M >\fP. .PP .SH "Detailed Description" @@ -26,4 +24,4 @@ Definition at line 22 of file moNextMove.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 index 854cccf66..f7ac8b395 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moNoAspirCrit" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoAspirCrit" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -68,4 +68,4 @@ Definition at line 43 of file moNoAspirCrit.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 index 933693c3a..68bdba67d 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moNoFitImprSolContinue" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoFitImprSolContinue" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -116,4 +116,4 @@ References moNoFitImprSolContinue< EOT >::counter, and moNoFitImprSolContinue< E .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 index 76197a989..88d44862c 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moRandImprSelect" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandImprSelect" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -106,7 +106,7 @@ Implements \fBmoMoveSelect< M >\fP. Definition at line 56 of file moRandImprSelect.h. .PP References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. -.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" +.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" .PP The move selection. .PP @@ -125,13 +125,11 @@ One the saved move is randomly chosen. .RE .PP -.PP -Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 77 of file moRandImprSelect.h. .PP -References eoRng::random(), moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. +References moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 b/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 index 567e72041..104b70a1d 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 @@ -1,4 +1,4 @@ -.TH "moRandMove" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandMove" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moRandMove \- Random move generator. .PP \fC#include \fP .PP -Inherits \fBeoUF< M &, void >\fP. -.PP .SH "Detailed Description" .PP @@ -24,4 +22,4 @@ Definition at line 21 of file moRandMove.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moSA.3 b/trunk/paradiseo-mo/doc/man/man3/moSA.3 index b21d90d0c..cf69b90c7 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSA.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSA.3 @@ -1,4 +1,4 @@ -.TH "moSA" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSA" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,7 +16,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &__move_rand, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, double __init_temp, \fBmoCoolingSchedule\fP &__cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &__move_rand, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, double __init_temp, \fBmoCoolingSchedule\fP &__cool_sched, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fISA constructor. \fP" .ti -1c @@ -60,7 +60,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIThe cooling schedule. \fP" .ti -1c -.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" +.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIA full evaluation function. \fP" .in -1c @@ -75,7 +75,7 @@ Class that describes a Simulated Annealing algorithm. Definition at line 30 of file moSA.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolingSchedule\fP & __cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolingSchedule\fP & __cool_sched, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP SA constructor. .PP @@ -101,7 +101,7 @@ All the boxes used by a SA need to be given. Definition at line 58 of file moSA.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" .PP function that launches the SA algorithm. .PP @@ -118,13 +118,11 @@ TRUE. .RE .PP -.PP -Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 80 of file moSA.h. .PP -References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, moSA< M >::move_rand, and eoRng::uniform(). +References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, and moSA< M >::move_rand. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 index 1e47ab9ae..e70b99a11 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 @@ -1,4 +1,4 @@ -.TH "moSimpleMoveTabuList" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleMoveTabuList" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -77,7 +77,7 @@ Class describing a move tabu list with a limited memory. Definition at line 22 of file moSimpleMoveTabuList.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" .PP Function that indicates if, in a given state, the _move is tabu or not. .PP @@ -94,8 +94,6 @@ true or false. .RE .PP -.PP -Implements \fBeoBF< const M &, const M::EOType &, bool >\fP. .PP Definition at line 46 of file moSimpleMoveTabuList.h. .PP @@ -157,4 +155,4 @@ Referenced by moSimpleMoveTabuList< M >::add(). .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 index 560960857..327986a8b 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 @@ -1,4 +1,4 @@ -.TH "moSimpleSolutionTabuList" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleSolutionTabuList" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -93,7 +93,7 @@ Definition at line 34 of file moSimpleSolutionTabuList.h. References moSimpleSolutionTabuList< M >::currentSize. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" .PP Function that indicates if, in a given state, the _move is tabu or not. .PP @@ -110,8 +110,6 @@ true or false. .RE .PP -.PP -Implements \fBeoBF< const M &, const M::EOType &, bool >\fP. .PP Definition at line 45 of file moSimpleSolutionTabuList.h. .PP @@ -173,4 +171,4 @@ Referenced by moSimpleSolutionTabuList< M >::add(). .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 index 1d8d40e8a..c405d240e 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moSolContinue" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSolContinue" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,9 +10,7 @@ moSolContinue \- Class that describes a stop criterion for a solution-based heur .PP \fC#include \fP .PP -Inherits \fBeoUF< const EOT &, bool >\fP. -.PP -Inherited by \fBmoGenSolContinue< EOT >\fP. +Inherited by \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmoNoFitImprSolContinue< EOT >\fP, and \fBmoSteadyFitSolContinue< EOT >\fP. .PP .SS "Public Member Functions" @@ -28,7 +26,7 @@ Inherited by \fBmoGenSolContinue< EOT >\fP. .SS "template class moSolContinue< EOT >" Class that describes a stop criterion for a solution-based heuristic. -It allows to add an initialisation procedure to an object that is a unary function (\fBeoUF\fP). +It allows to add an initialisation procedure to an object that is a unary function (eoUF). .PP Definition at line 22 of file moSolContinue.h. .SH "Member Function Documentation" @@ -39,8 +37,8 @@ Procedure which initialises all that the stop criterion needs. .PP Generally, it allocates some data structures or initialises some counters. .PP -Implemented in \fBmoGenSolContinue< EOT >\fP. +Implemented in \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmoNoFitImprSolContinue< EOT >\fP, and \fBmoSteadyFitSolContinue< EOT >\fP. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 index 0bd148bca..d1a430265 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moSteadyFitSolContinue" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSteadyFitSolContinue" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -126,4 +126,4 @@ References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT > .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moTS.3 b/trunk/paradiseo-mo/doc/man/man3/moTS.3 index aa81de64e..990f2e4ba 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moTS.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moTS.3 @@ -1,4 +1,4 @@ -.TH "moTS" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTS" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,11 +16,11 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoTabuList\fP< M > &__tabu_list, \fBmoAspirCrit\fP< M > &__aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoTabuList\fP< M > &__tabu_list, \fBmoAspirCrit\fP< M > &__aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fIConstructor of a \fBmoTS\fP specifying all the boxes. \fP" .ti -1c -.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fIConstructor with less parameters. \fP" .ti -1c @@ -52,7 +52,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIStop criterion. \fP" .ti -1c -.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" +.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIFull evaluation function. \fP" .in -1c @@ -67,7 +67,7 @@ Generic algorithm that describes a tabu search. Definition at line 29 of file moTS.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Constructor of a \fBmoTS\fP specifying all the boxes. .PP @@ -93,7 +93,7 @@ In this constructor, a \fBmoTSMoveLoopExpl\fP is instanciated. .PP Definition at line 58 of file moTS.h. -.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Constructor with less parameters. .PP @@ -113,7 +113,7 @@ The explorer is given in the parameters. Definition at line 71 of file moTS.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" .PP Function which launchs the Tabu Search. .PP @@ -130,8 +130,6 @@ TRUE. .RE .PP -.PP -Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 85 of file moTS.h. .PP @@ -139,4 +137,4 @@ References moTS< M >::cont, moTS< M >::full_eval, and moTS< M >::move_expl. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 index ae467fe08..25b5b624b 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moTSMoveLoopExpl" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTSMoveLoopExpl" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -99,7 +99,7 @@ Definition at line 49 of file moTSMoveLoopExpl.h. References moTSMoveLoopExpl< M >::aspir_crit, and moTSMoveLoopExpl< M >::tabu_list. .SH "Member Function Documentation" .PP -.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP" +.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline]\fP" .PP Procedure which lauches the exploration. .PP @@ -113,8 +113,6 @@ The exploration continues while the chosen move is not in the tabu list or the a .RE .PP -.PP -Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP. .PP Definition at line 69 of file moTSMoveLoopExpl.h. .PP @@ -122,4 +120,4 @@ References moTSMoveLoopExpl< M >::aspir_crit, moTSMoveLoopExpl< M >::incr_eval, .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 index 19fa9d5b7..cbc9bcd7d 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 @@ -1,4 +1,4 @@ -.TH "moTabuList" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTabuList" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses. .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, bool >\fP. -.PP Inherited by \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. .PP .SS "Public Types" @@ -71,15 +69,15 @@ Procedure that updates the tabu list content. .PP Generally, a counter associated to each saved move is decreased by one. .PP -Implemented in \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. +Implemented in \fBmoSimpleMoveTabuList< M >\fP, \fBmoSimpleSolutionTabuList< M >\fP, and \fBTwoOptTabuList\fP. .SS "template virtual void \fBmoTabuList\fP< M >::init ()\fC [pure virtual]\fP" .PP Procedure which initialises the tabu list. .PP Can be useful if the data structure needs to be allocated before being used. .PP -Implemented in \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. +Implemented in \fBmoSimpleMoveTabuList< M >\fP, \fBmoSimpleSolutionTabuList< M >\fP, and \fBTwoOptTabuList\fP. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/mo.doxytag b/trunk/paradiseo-mo/doc/mo.doxytag new file mode 100644 index 000000000..cd684b20c --- /dev/null +++ b/trunk/paradiseo-mo/doc/mo.doxytag @@ -0,0 +1,1342 @@ + + + + main + Welcome to PARADISEO-Moving Objects + main + intro + tutorial + install + design + + + EmptySelection + class_empty_selection.html + + + moAlgo + classmo_algo.html + EOT + + + moAspirCrit + classmo_aspir_crit.html + M + + virtual void + init + classmo_aspir_crit.html + a8ce84510a5ec7c9078381e542c6d140 + ()=0 + + + + moBestImprSelect + classmo_best_impr_select.html + M + moMoveSelect + + M::EOType::Fitness + Fitness + classmo_best_impr_select.html + c4ae17435221fb0a8e8acd285210cfcb + + + + void + init + classmo_best_impr_select.html + 2d2abf9aa17dc77cbb4f41810ab7b956 + (const Fitness &__fit) + + + bool + update + classmo_best_impr_select.html + d10e3e6f8a0277731e95ef506d064d6d + (const M &__move, const Fitness &__fit) + + + void + operator() + classmo_best_impr_select.html + 169773d4d127acd782cf379f758222da + (M &__move, Fitness &__fit) + + + bool + first_time + classmo_best_impr_select.html + 352b14d206b0772eb9f40efb7beb0f13 + + + + M + best_move + classmo_best_impr_select.html + bd86f70519f954c07ff0d8a2a3a8ff6a + + + + Fitness + best_fit + classmo_best_impr_select.html + dcac897424b5805f146bb1dbb429f2fe + + + + + moComparator + classmo_comparator.html + EOT + + + moCoolingSchedule + classmo_cooling_schedule.html + + + moExponentialCoolingSchedule + classmo_exponential_cooling_schedule.html + moCoolingSchedule + + + moExponentialCoolingSchedule + classmo_exponential_cooling_schedule.html + b01930c1051c0940666c6325bfd036bc + (double __threshold, double __ratio) + + + bool + operator() + classmo_exponential_cooling_schedule.html + 00642b03453b51612a10fcf2280543db + (double &__temp) + + + double + threshold + classmo_exponential_cooling_schedule.html + 8d4327c0bb33b7121a322279eea97f84 + + + + double + ratio + classmo_exponential_cooling_schedule.html + e8f3f87417c1c7253efb938a740846fa + + + + + moFirstImprSelect + classmo_first_impr_select.html + M + moMoveSelect + + M::EOType::Fitness + Fitness + classmo_first_impr_select.html + 64763ce3e6d2873266624382b407fa5a + + + + virtual void + init + classmo_first_impr_select.html + 4c5ce18ede46247a439c68f6954a4055 + (const Fitness &__fit) + + + bool + update + classmo_first_impr_select.html + 7ba0882728daedc75c249647c070ccf0 + (const M &__move, const typename M::EOType::Fitness &__fit) + + + void + operator() + classmo_first_impr_select.html + 3be12cf4cbaed00df7c4fa735b2c0a95 + (M &__move, Fitness &__fit) + + + bool + valid + classmo_first_impr_select.html + a99c0586ba07449234705c17a258d58c + + + + M + best_move + classmo_first_impr_select.html + dfed419a608dd7c41f07fa1f1279cb8c + + + + Fitness + init_fit + classmo_first_impr_select.html + ce7ba63e8cc3a9164f4e546477e98ca8 + + + + Fitness + best_fit + classmo_first_impr_select.html + e1190347b76ec6fe717be32354b4a9a9 + + + + + moFitComparator + classmo_fit_comparator.html + EOT + moComparator + + bool + operator() + classmo_fit_comparator.html + c920d5a49deb16710daf1e5fcde6b16c + (const EOT &_solution1, const EOT &_solution2) + + + + moFitSolContinue + classmo_fit_sol_continue.html + EOT + moSolContinue + + EOT::Fitness + Fitness + classmo_fit_sol_continue.html + 369ed94a788d8bdc08d5554f7669376f + + + + + moFitSolContinue + classmo_fit_sol_continue.html + b14f37ba88de4e12583b22f5aabeb682 + (Fitness __fitness) + + + bool + operator() + classmo_fit_sol_continue.html + fa9f0a15f99c998115cae9b456403a27 + (const EOT &__sol) + + + void + init + classmo_fit_sol_continue.html + 670bd895b4edfcd3aebb40d2295d7f7c + () + + + Fitness + fitness + classmo_fit_sol_continue.html + 87d0ba8f2f76f61c89317eed5f094dfc + + + + + moGenSolContinue + classmo_gen_sol_continue.html + EOT + moSolContinue + + + moGenSolContinue + classmo_gen_sol_continue.html + b56e890f1caa3f98e161c6512b59c95b + (unsigned int __maxNumGen) + + + bool + operator() + classmo_gen_sol_continue.html + 457257cd73b474d6f7783d84d02c2e61 + (const EOT &__sol) + + + void + init + classmo_gen_sol_continue.html + 6c5db8182157584b56507cc9075602d4 + () + + + unsigned int + maxNumGen + classmo_gen_sol_continue.html + 30b9861e090578bdfa2374806600987a + + + + unsigned int + numGen + classmo_gen_sol_continue.html + 630d9736a3a2c952540cdc211764258c + + + + + moHC + classmo_h_c.html + M + moAlgo< M::EOType > + + + moHC + classmo_h_c.html + 6cafe093f86a80c225827884cb9dc5b7 + (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval) + + + + moHC + classmo_h_c.html + 45f27309792e584a27fa6dcb86ccda65 + (moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval) + + + bool + operator() + classmo_h_c.html + ed4e273c420efa6386c5975a696a5010 + (EOT &__sol) + + + M::EOType + EOT + classmo_h_c.html + d219296ede03c679646bce2fe8ff96cb + + + + EOT::Fitness + Fitness + classmo_h_c.html + 56487c97a7cf0c423cc879d1bbd45027 + + + + moMoveExpl< M > & + move_expl + classmo_h_c.html + f6bfb4553fb699f1e08f7d9c37d06103 + + + + eoEvalFunc< EOT > & + full_eval + classmo_h_c.html + 4b0d5cc70fc3d83f59a48b2bdea65736 + + + + + moHCMoveLoopExpl + classmo_h_c_move_loop_expl.html + M + moMoveLoopExpl + + + moHCMoveLoopExpl + classmo_h_c_move_loop_expl.html + 11410d648d79746253e9dc249c4ec7b5 + (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select) + + + void + operator() + classmo_h_c_move_loop_expl.html + f48d5379caac7f6a165e9fe8840e6ccb + (const EOT &__old_sol, EOT &__new_sol) + + + M::EOType + EOT + classmo_h_c_move_loop_expl.html + 077befd4106c201eafd3ea22bcea2fe9 + + + + M::EOType::Fitness + Fitness + classmo_h_c_move_loop_expl.html + f24871224316d5549b9013a2d27ab465 + + + + moMoveInit< M > & + move_init + classmo_h_c_move_loop_expl.html + 6776fc51331c1b452d026b92448b4ffc + + + + moNextMove< M > & + next_move + classmo_h_c_move_loop_expl.html + f716c5271e0eba9275c585dc52768443 + + + + moMoveIncrEval< M > & + incr_eval + classmo_h_c_move_loop_expl.html + 84a8fccba05ab30414281469bc8ee779 + + + + moMoveSelect< M > & + move_select + classmo_h_c_move_loop_expl.html + 13bcd1322b2b97fd665be2f60c532fbb + + + + + moILS + classmo_i_l_s.html + M + moAlgo< M::EOType > + + + moILS + classmo_i_l_s.html + f7f2fc1f905954d78edcec0e3ca53551 + (moAlgo< EOT > &__algo, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval) + + + + moILS + classmo_i_l_s.html + c4ebdab294ee1085ddcb9bf2a6882cf0 + (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval) + + + + moILS + classmo_i_l_s.html + d27e3435b8f6592091431fde6f185769 + (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__moTS_continue, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval) + + + + moILS + classmo_i_l_s.html + 292acc5218e8f148e8b174f183820696 + (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__moSA_continue, double __init_temp, moCoolingSchedule &__cool_sched, moSolContinue< EOT > &__continue, moComparator< EOT > &__acceptance_criterion, eoMonOp< EOT > &__perturbation, eoEvalFunc< EOT > &__full_eval) + + + bool + operator() + classmo_i_l_s.html + b3954a77b43fee31122d2a210b2a82d7 + (EOT &__sol) + + + M::EOType + EOT + classmo_i_l_s.html + c81bafc611e4d4fd44347cf7162198c7 + + + + EOT::Fitness + Fitness + classmo_i_l_s.html + 8c464a9eae064a78eff75d4c722b619c + + + + moAlgo< EOT > & + algo + classmo_i_l_s.html + 8373e40b60afdd761789a97b47adece9 + + + + moSolContinue< EOT > & + cont + classmo_i_l_s.html + c3046ba0a31a35470391987ac37afd64 + + + + moComparator< EOT > & + acceptance_criterion + classmo_i_l_s.html + 295f6d0342c67bd3dc4cb82e2adc26be + + + + eoMonOp< EOT > & + perturbation + classmo_i_l_s.html + f667a1bda06b6d221292df9aba3db8a2 + + + + eoEvalFunc< EOT > & + full_eval + classmo_i_l_s.html + 8000f02fac668d51026e458c9febce7c + + + + + moImprBestFitAspirCrit + classmo_impr_best_fit_aspir_crit.html + M + moAspirCrit + + M::EOType::Fitness + Fitness + classmo_impr_best_fit_aspir_crit.html + 0bc1a8c9af99781e662570c04750cca8 + + + + + moImprBestFitAspirCrit + classmo_impr_best_fit_aspir_crit.html + e2c697a5cf3a7696e38bb52b6694a340 + () + + + void + init + classmo_impr_best_fit_aspir_crit.html + ffa451a14ff4ea86fb8bd9fdbc348630 + () + + + bool + operator() + classmo_impr_best_fit_aspir_crit.html + 53f62fb56dcae3051a741f1fddb0204b + (const M &__move, const Fitness &__fit) + + + Fitness + best_fit + classmo_impr_best_fit_aspir_crit.html + 9e52383f0af8013b4aff0942325e1bf3 + + + + bool + first_time + classmo_impr_best_fit_aspir_crit.html + 2d5226c7dd661b33011402dbbbe78265 + + + + + moItRandNextMove + classmo_it_rand_next_move.html + M + moNextMove + + + moItRandNextMove + classmo_it_rand_next_move.html + 2b61b3713d482ecf71db8d941551ff7a + (moRandMove< M > &__rand_move, unsigned int __max_iter) + + + bool + operator() + classmo_it_rand_next_move.html + 92a2fbbc02a20853b9a309e99018a102 + (M &__move, const EOT &__sol) + + + M::EOType + EOT + classmo_it_rand_next_move.html + ee666007fc494bf4a5f0cd065e5671cf + + + + moRandMove< M > & + rand_move + classmo_it_rand_next_move.html + ef9410ec5e7dfa7f002e05967931c459 + + + + unsigned int + max_iter + classmo_it_rand_next_move.html + dc67fa86677d7a4f982de8d8b1eba033 + + + + unsigned int + num_iter + classmo_it_rand_next_move.html + f43494b13931d8f76b5d9d5d6469e91b + + + + + moLinearCoolingSchedule + classmo_linear_cooling_schedule.html + moCoolingSchedule + + + moLinearCoolingSchedule + classmo_linear_cooling_schedule.html + 2fdde7b1520d5a41251627e81cc9c13d + (double __threshold, double __quantity) + + + bool + operator() + classmo_linear_cooling_schedule.html + 814b109fdfd9426a92a5444b05014da3 + (double &__temp) + + + double + threshold + classmo_linear_cooling_schedule.html + e7f539f986801ea71392c4a55ba08a76 + + + + double + quantity + classmo_linear_cooling_schedule.html + 6159dc39ceda89b23ffdab3d6ce8d8ed + + + + + moLSCheckPoint + classmo_l_s_check_point.html + M + + void + operator() + classmo_l_s_check_point.html + 2f9c1250279e3f49ec77a66c10029f1e + (const M &__move, const typename M::EOType &__sol) + + + void + add + classmo_l_s_check_point.html + 66be5fe2944bcdd752f1e58105e969a6 + (eoBF< const M &, const typename M::EOType &, void > &__f) + + + std::vector< eoBF< const M &, const typename M::EOType &, void > * > + func + classmo_l_s_check_point.html + ff2a31ee5689a804bd9a572c51a36ca4 + + + + + moMove + classmo_move.html + EOT + + EOT + EOType + classmo_move.html + 7fb853a91ba1319530529e515380bbba + + + + + moMoveExpl + classmo_move_expl.html + M + + + moMoveIncrEval + classmo_move_incr_eval.html + M + + + moMoveInit + classmo_move_init.html + M + + + moMoveLoopExpl + classmo_move_loop_expl.html + M + moMoveExpl + + + moMoveSelect + classmo_move_select.html + M + + M::EOType::Fitness + Fitness + classmo_move_select.html + 8148ccc0e6fbd209c3fe6829559895c8 + + + + virtual void + init + classmo_move_select.html + bca4c43f13d26eca7163aeb272a4a52e + (const Fitness &__fit)=0 + + + virtual bool + update + classmo_move_select.html + 7c157b6e64fd417acf6e900059204eb1 + (const M &__move, const Fitness &__fit)=0 + + + + moNextMove + classmo_next_move.html + M + + + moNoAspirCrit + classmo_no_aspir_crit.html + M + moAspirCrit + + bool + operator() + classmo_no_aspir_crit.html + 8a7180a8d5c25bfb6727d0b59551b0f8 + (const M &__move, const typename M::EOType::Fitness &__sol) + + + void + init + classmo_no_aspir_crit.html + f3a286fc4c2d36bd390ba9a3074f3037 + () + + + + moNoFitImprSolContinue + classmo_no_fit_impr_sol_continue.html + EOT + moSolContinue + + EOT::Fitness + Fitness + classmo_no_fit_impr_sol_continue.html + 64c184de66bb37d75d53aa600ac947b3 + + + + + moNoFitImprSolContinue + classmo_no_fit_impr_sol_continue.html + a447aa0d8ed4ddf6fe47c805269cac6c + (unsigned int __maxNumberOfIterationWithoutImprovement) + + + bool + operator() + classmo_no_fit_impr_sol_continue.html + dbd663623cae56ec76ee504ecb226fed + (const EOT &__sol) + + + void + init + classmo_no_fit_impr_sol_continue.html + 21641c0a38a4501baae6133cbc591de4 + () + + + unsigned int + maxNumberOfIterationsWithoutImprovement + classmo_no_fit_impr_sol_continue.html + 03612ffc3af9d943c1b1d2cde09d461b + + + + bool + firstFitnessSaved + classmo_no_fit_impr_sol_continue.html + ca3591e47a075b59e0826f31234c71ef + + + + Fitness + fitness + classmo_no_fit_impr_sol_continue.html + 3d3d2b43a4dd73e38689cc0018d44ee7 + + + + unsigned int + counter + classmo_no_fit_impr_sol_continue.html + 46fc008a8f7cd06dcaaeb4016b433adb + + + + + moRandImprSelect + classmo_rand_impr_select.html + M + moMoveSelect + + M::EOType::Fitness + Fitness + classmo_rand_impr_select.html + 3bff2fdb963297430543c82ffb567a5c + + + + void + init + classmo_rand_impr_select.html + a19726a1509cff874801615d63a3b5d9 + (const Fitness &__fit) + + + bool + update + classmo_rand_impr_select.html + 60ae5548560caee7e28d5ed2446186c9 + (const M &__move, const Fitness &__fit) + + + void + operator() + classmo_rand_impr_select.html + 5ee57f77a450c0a9ce50bfccf3ad2a55 + (M &__move, Fitness &__fit) + + + Fitness + init_fit + classmo_rand_impr_select.html + d153c277a0a2ea95ac484210d445b40e + + + + std::vector< Fitness > + vect_better_fit + classmo_rand_impr_select.html + 05c7c3b858e8a25632f2f5c86b0c97a3 + + + + std::vector< M > + vect_better_moves + classmo_rand_impr_select.html + 2ace12bd179144fa71d56324694201f5 + + + + + moRandMove + classmo_rand_move.html + M + + + moSA + classmo_s_a.html + M + moAlgo< M::EOType > + + + moSA + classmo_s_a.html + 01f6a44483e5a7abbce33eb480b6a9b9 + (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval) + + + bool + operator() + classmo_s_a.html + 0e4c54b57bc13fcbd4763883b8f719e5 + (EOT &__sol) + + + M::EOType + EOT + classmo_s_a.html + d5d64a8797bdedc7b3af7893aded0bd5 + + + + EOT::Fitness + Fitness + classmo_s_a.html + 97f1a40d5ab5a0b3f878d0347b34804b + + + + moRandMove< M > & + move_rand + classmo_s_a.html + 71c49935b63a202d25888a5f86121fec + + + + moMoveIncrEval< M > & + incr_eval + classmo_s_a.html + 4c3be32e9832e465b24e6d33559356bc + + + + moSolContinue< EOT > & + cont + classmo_s_a.html + 54484c8a514866ea496e0058c2e09716 + + + + double + init_temp + classmo_s_a.html + f1af7636b52aa5f6b381f8187b667bd4 + + + + moCoolingSchedule & + cool_sched + classmo_s_a.html + 11c7d0cab649b7d680dd85bb74cb4ff6 + + + + eoEvalFunc< EOT > & + full_eval + classmo_s_a.html + bcd6a940046f23dd741444c0b85edf2c + + + + + moSimpleMoveTabuList + classmo_simple_move_tabu_list.html + M + moTabuList + + M::EOType + EOT + classmo_simple_move_tabu_list.html + 91286ff3ba6b1e9e1db9e4fdade2edb7 + + + + + moSimpleMoveTabuList + classmo_simple_move_tabu_list.html + 12798ce0bc3a2ee031fb301290ed6d79 + (unsigned int __size) + + + bool + operator() + classmo_simple_move_tabu_list.html + bb7fe9da28617f56734af71c42c8265a + (const M &__move, const EOT &__sol) + + + void + add + classmo_simple_move_tabu_list.html + 43c979a9ec876c5e5b591b1c422395ef + (const M &__move, const EOT &__sol) + + + void + update + classmo_simple_move_tabu_list.html + 96cffc8118456ed762b07b9fc0e0679f + () + + + void + init + classmo_simple_move_tabu_list.html + b91ae9971be30769757d1ad92c6009dc + () + + + void + removeMove + classmo_simple_move_tabu_list.html + a3fa2bd19e09f1541878fa28e867d20f + (const M &__move) + + + unsigned int + maxSize + classmo_simple_move_tabu_list.html + e48848e9e5c9c8435475cbdf21658e23 + + + + unsigned int + currentSize + classmo_simple_move_tabu_list.html + f1f9524e62d48f3688aa58a6055ccceb + + + + std::list< M > + tabuList + classmo_simple_move_tabu_list.html + d91bc838361524720616b44eda9b2c3a + + + + + moSimpleSolutionTabuList + classmo_simple_solution_tabu_list.html + M + moTabuList + + M::EOType + EOT + classmo_simple_solution_tabu_list.html + 881060871a6b49e5e8554c5df85176d9 + + + + + moSimpleSolutionTabuList + classmo_simple_solution_tabu_list.html + 8f8ce82b49ff49efbd934cedd3e34178 + (unsigned int __size) + + + bool + operator() + classmo_simple_solution_tabu_list.html + e1f1cf258b55554d8be88fb5780a0047 + (const M &__move, const EOT &__sol) + + + void + add + classmo_simple_solution_tabu_list.html + fd6b3a1764121169650c969bba895615 + (const M &__move, const EOT &__sol) + + + void + update + classmo_simple_solution_tabu_list.html + 91b8b01dba7ffea8b63765d931e56f56 + () + + + void + init + classmo_simple_solution_tabu_list.html + d5645c39fec71a6110a2cbccbb08b816 + () + + + void + removeSolution + classmo_simple_solution_tabu_list.html + 7847a48f33c15e31298f3e715d754560 + (const EOT &__sol) + + + unsigned int + maxSize + classmo_simple_solution_tabu_list.html + 662e1f65fadff234692be009a2440845 + + + + unsigned int + currentSize + classmo_simple_solution_tabu_list.html + 2aaf6e882d10495adddae94cb7a48fbf + + + + std::list< EOT > + tabuList + classmo_simple_solution_tabu_list.html + 75df9cd683528d3722d02bac407b710b + + + + + moSolContinue + classmo_sol_continue.html + EOT + + virtual void + init + classmo_sol_continue.html + 064dc966a210f4ffb9515be3f03ca4c7 + ()=0 + + + + moSteadyFitSolContinue + classmo_steady_fit_sol_continue.html + EOT + moSolContinue + + EOT::Fitness + Fitness + classmo_steady_fit_sol_continue.html + c289721abbbafe50f6e3b8305dd31007 + + + + + moSteadyFitSolContinue + classmo_steady_fit_sol_continue.html + 5f50fb18e380230e37301f33319786a4 + (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement) + + + bool + operator() + classmo_steady_fit_sol_continue.html + 942e58ec00bb61000a83c80176e14bc3 + (const EOT &__sol) + + + void + init + classmo_steady_fit_sol_continue.html + 87563493addc8e4b58982c55a67179b9 + () + + + unsigned int + maxNumberOfIterations + classmo_steady_fit_sol_continue.html + 36b43c2a252887ad027165ac32393fe8 + + + + unsigned int + maxNumberOfIterationsWithoutImprovement + classmo_steady_fit_sol_continue.html + cde593c09f497a5fa66ff62732544f40 + + + + bool + maxNumberOfIterationsReached + classmo_steady_fit_sol_continue.html + 7d88c0eb91b2a12121ba1c3ae9139887 + + + + bool + firstFitnessSaved + classmo_steady_fit_sol_continue.html + 025bf2789e470fdde989eee9121035c3 + + + + Fitness + fitness + classmo_steady_fit_sol_continue.html + a5c62e7049b36f6e71e92b559568c09e + + + + unsigned int + counter + classmo_steady_fit_sol_continue.html + 245c9099a2c40dfc4f34b3ff216d13ce + + + + + moTabuList + classmo_tabu_list.html + M + + M::EOType + EOT + classmo_tabu_list.html + e219715cc3fdd5626764bc50ce6357df + + + + virtual void + add + classmo_tabu_list.html + d279d72cb486d812da1ad3d24a69c286 + (const M &__move, const EOT &__sol)=0 + + + virtual void + update + classmo_tabu_list.html + a2e5d1132f064093c8ed57046405f5ca + ()=0 + + + virtual void + init + classmo_tabu_list.html + 0a06c459d56e8e2b408a8f3c6aec4e57 + ()=0 + + + + moTS + classmo_t_s.html + M + moAlgo< M::EOType > + + + moTS + classmo_t_s.html + 2be23f4524733ee6f37b71310d76407e + (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval) + + + + moTS + classmo_t_s.html + 508e675c4232cf2ca06dded931c90bab + (moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval) + + + bool + operator() + classmo_t_s.html + 94d25a76fe1bc9ef0bbd0358ff55aceb + (EOT &__sol) + + + M::EOType + EOT + classmo_t_s.html + 90d19d468c12ab5bd796948ce1ce79b1 + + + + EOT::Fitness + Fitness + classmo_t_s.html + aa0eefbb17111422e495d1255f876fca + + + + moMoveExpl< M > & + move_expl + classmo_t_s.html + 06914ddc90ca96e9158c8dbe182a7865 + + + + moSolContinue< EOT > & + cont + classmo_t_s.html + 969371cd2202f3d29cbb426f57ac7d3a + + + + eoEvalFunc< EOT > & + full_eval + classmo_t_s.html + fb67eddae5d0bfca4ed881995523231e + + + + + moTSMoveLoopExpl + classmo_t_s_move_loop_expl.html + M + moMoveLoopExpl + + + moTSMoveLoopExpl + classmo_t_s_move_loop_expl.html + 43306dae9df150a8d9dc0dec9cd6a381 + (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit) + + + void + operator() + classmo_t_s_move_loop_expl.html + f601bbd0ccc41d6fbe3df9fcd87ad9e7 + (const EOT &__old_sol, EOT &__new_sol) + + + M::EOType + EOT + classmo_t_s_move_loop_expl.html + 47f42225e2ed096374b818bdb848a527 + + + + M::EOType::Fitness + Fitness + classmo_t_s_move_loop_expl.html + a1ba36c937b195ca2f7d1a24adaa7018 + + + + moMoveInit< M > & + move_init + classmo_t_s_move_loop_expl.html + 6b23f99648902fb72ed17a4a6fa4e400 + + + + moNextMove< M > & + next_move + classmo_t_s_move_loop_expl.html + aeeff6666d26ff5c67acd9c153a5ae49 + + + + moMoveIncrEval< M > & + incr_eval + classmo_t_s_move_loop_expl.html + ee4443fc8e45d840697619678628c26c + + + + moBestImprSelect< M > + move_select + classmo_t_s_move_loop_expl.html + 35a3f3035fb8df875c281d9838904bf1 + + + + moTabuList< M > & + tabu_list + classmo_t_s_move_loop_expl.html + 0e5988a940ba218e87c53b7e56d79790 + + + + moAspirCrit< M > & + aspir_crit + classmo_t_s_move_loop_expl.html + 6786cf5422d17cbf872b07ae74ca6b0f + + + + diff --git a/trunk/paradiseo-mo/src/mo.h b/trunk/paradiseo-mo/src/mo.h index 58476ce6b..e94fc25f3 100755 --- a/trunk/paradiseo-mo/src/mo.h +++ b/trunk/paradiseo-mo/src/mo.h @@ -15,13 +15,16 @@ #include "moAlgo.h" #include "moAspirCrit.h" #include "moBestImprSelect.h" +#include "moComparator.h" #include "moCoolingSchedule.h" #include "moExponentialCoolingSchedule.h" #include "moFirstImprSelect.h" +#include "moFitComparator.h" #include "moGenSolContinue.h" #include "moHC.h" #include "moHCMoveLoopExpl.h" #include "moImprBestFitAspirCrit.h" +#include "moILS.h" #include "moItRandNextMove.h" #include "moLinearCoolingSchedule.h" #include "moLSCheckPoint.h" diff --git a/trunk/paradiseo-mo/src/moComparator.h b/trunk/paradiseo-mo/src/moComparator.h new file mode 100644 index 000000000..a76642385 --- /dev/null +++ b/trunk/paradiseo-mo/src/moComparator.h @@ -0,0 +1,25 @@ +// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- + +// "moComparator.h" + +// (c) OPAC Team, LIFL, 2003-2007 + +/* TEXT LICENCE + + Contact: paradiseo-help@lists.gforge.inria.fr +*/ + +#ifndef __moComparator_h +#define __moComparator_h + + +//! Template for classes which need to compare two EOT and indicate if the first is "better" than the second. +/*! + The objects that extend this template describe how an EOT is "better" than an other. + */ +template +class moComparator: public eoBF +{ +}; + +#endif diff --git a/trunk/paradiseo-mo/src/moFitComparator.h b/trunk/paradiseo-mo/src/moFitComparator.h new file mode 100644 index 000000000..8b0ab6493 --- /dev/null +++ b/trunk/paradiseo-mo/src/moFitComparator.h @@ -0,0 +1,29 @@ +// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- + +// "moFitComparator.h" + +// (c) OPAC Team, LIFL, 2003-2007 + +/* TEXT LICENCE + + Contact: paradiseo-help@lists.gforge.inria.fr +*/ + +#ifndef __moFitComparator_h +#define __moFitComparator_h + +//! Comparison according to the fitness. +/*! + An EOT is better than an other if its fitness is better. + */ +template +class moFitComparator: public moComparator +{ + public: + bool operator()(const EOT& _solution1, const EOT& _solution2) + { + return _solution1.fitness()>_solution2.fitness(); + } +}; + +#endif diff --git a/trunk/paradiseo-mo/src/moILS.h b/trunk/paradiseo-mo/src/moILS.h new file mode 100644 index 000000000..be88ebb59 --- /dev/null +++ b/trunk/paradiseo-mo/src/moILS.h @@ -0,0 +1,185 @@ +// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- + +// "moILS.h" + +// (c) OPAC Team, LIFL, 2003-2007 + +/* LICENCE TEXT + + Contact: paradiseo-help@lists.gforge.inria.fr +*/ + +#ifndef __moILS_h +#define __moILS_h + +#include + +#include "moHC.h" +#include "moTS.h" +#include "moSA.h" + +//! Iterated Local Search (ILS) +/*! + Class which describes the algorithm for a iterated local search. + */ +template < class M > class moILS:public moAlgo < typename M::EOType > +{ + + //! Alias for the type. + typedef typename M::EOType EOT; + + //! Alias for the fitness. + typedef typename EOT::Fitness Fitness; + +public: + + //! Generic constructor + /*! + Generic constructor using a moAlgo + + \param __algo The solution based heuristic to use. + \param __continue The stopping criterion. + \param __acceptance_criterion The acceptance criterion. + \param __perturbation The pertubation generator. + \param __full_eval The evaluation function. + */ + moILS (moAlgo &__algo, moSolContinue &__continue, moComparator &__acceptance_criterion, eoMonOp &__perturbation, + eoEvalFunc &__full_eval): + algo(__algo), cont(__continue), acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval) + {} + + //! Constructor for using a moHC for the moAlgo + /*! + \param __move_init The move initialisation (for the moHC). + \param __next_move The move generator (for the moHC). + \param __incr_eval The partial evaluation function (for the moHC). + \param __move_select The move selection strategy (for the moHC). + \param __continue The stopping criterion. + \param __acceptance_criterion The acceptance criterion. + \param __perturbation The pertubation generator. + \param __full_eval The evaluation function. + */ + moILS (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, + moMoveSelect < M > &__move_select, moSolContinue &__continue, moComparator &__acceptance_criterion, + eoMonOp &__perturbation, eoEvalFunc &__full_eval): + algo(*new moHC(__move_init, __next_move, __incr_eval, __move_select, __full_eval)), cont(__continue), + acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval) + {} + + //! Constructor for using a moTS for the moAlgo + /*! + \param __move_init The move initialisation (for the moTS). + \param __next_move The move generator (for the moTS). + \param __incr_eval The partial evaluation function (for the moTS). + \param __tabu_list The tabu list (for the moTS !!!!). + \param __aspir_crit The aspiration criterion (for the moTS). + \param __moTS_continue The stopping criterion (for the moTS). + \param __continue The stopping criterion. + \param __acceptance_criterion The acceptance criterion. + \param __perturbation The pertubation generator. + \param __full_eval The evaluation function. + */ + moILS (moMoveInit &__move_init, moNextMove &__next_move, moMoveIncrEval &__incr_eval, + moTabuList &__tabu_list, moAspirCrit &__aspir_crit, moSolContinue &__moTS_continue, + moSolContinue &__continue, moComparator &__acceptance_criterion, eoMonOp &__perturbation, + eoEvalFunc &__full_eval): + algo(*new moTS(__move_init, __next_move, __incr_eval, __tabu_list, __aspir_crit, __moTS_continue, __full_eval)), + cont(__continue), acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval) + {} + + //! Constructor for using a moTS for the moAlgo + /*! + \param __move_rand The random move generator (for the moSA). + \param __incr_eval The partial evaluation function (for the moSA). + \param __moSA_continue The stopping criterion (for the moSA). + \param __init_temp The initial temperature (for the moSA). + \param __cool_sched The cooling scheduler (for the moSA). + \param __continue The stopping criterion. + \param __acceptance_criterion The acceptance criterion. + \param __perturbation The pertubation generator. + \param __full_eval The evaluation function. + */ + moILS (moRandMove &__move_rand, moMoveIncrEval &__incr_eval, moSolContinue &__moSA_continue, double __init_temp, + moCoolingSchedule & __cool_sched, moSolContinue &__continue, moComparator &__acceptance_criterion, + eoMonOp &__perturbation, eoEvalFunc &__full_eval): + algo(*new moSA(__move_rand, __incr_eval, __moSA_continue, __init_temp, __cool_sched, __full_eval)), + cont(__continue), acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval) + {} + + + + //! Function which launches the ILS + /*! + The ILS has to improve a current solution. + As the moSA, the moTS and the moHC, it can be used for HYBRIDATION in an evolutionnary algorithm. + + \param __sol a current solution to improve. + \return TRUE. + */ + bool operator()(EOT & __sol) + { + EOT __sol_saved=__sol; + + cont.init (); + + //some code has been duplicated in order to avoid one perturbation and one evaluation without adding a test in the loop. + + //std::cout << "Before intensification: " << __sol.fitness() << std::endl; + algo(__sol); + //std::cout << "After intensification: " << __sol.fitness() << std::endl; + + if(acceptance_criterion(__sol, __sol_saved)) + { + std::cout << "Accepted: " << __sol.fitness() << std::endl; + __sol_saved=__sol; + + } + else + { + //std::cout << "Refused" << std::endl; + __sol=__sol_saved; + } + + while (cont (__sol)) + { + perturbation(__sol); + full_eval(__sol); + + //std::cout << "Before intensification: " << __sol.fitness() << std::endl; + algo(__sol); + //std::cout << "After intensification: " << __sol.fitness() << std::endl; + + if(acceptance_criterion(__sol, __sol_saved)) + { + std::cout << "Accepted: " << __sol.fitness() << std::endl; + __sol_saved=__sol; + } + else + { + //std::cout << "Refused" << std::endl; + __sol=__sol_saved; + } + } + + return true; + } + +private: + + //! The solution based heuristic. + moAlgo &algo; + + //! The stopping criterion. + moSolContinue &cont; + + //! The acceptance criterion. + moComparator &acceptance_criterion; + + //! The perturbation generator + eoMonOp &perturbation; + + //! The full evaluation function + eoEvalFunc &full_eval; +}; + +#endif diff --git a/trunk/paradiseo-mo/tutorial/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/CMakeLists.txt index 0bc6daac1..e8d84ac73 100644 --- a/trunk/paradiseo-mo/tutorial/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/CMakeLists.txt @@ -12,6 +12,6 @@ SET(TSP_BINARY_DIR ${ParadisEO-MO_BINARY_DIR}/tutorial/examples/tsp CACHE PATH " ### 2) Where must cmake go now ? ###################################################################################### -SUBDIRS(examples Lesson1 Lesson2 Lesson3) +SUBDIRS(examples Lesson1 Lesson2 Lesson3 Lesson4) ###################################################################################### diff --git a/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt new file mode 100644 index 000000000..5afdc8647 --- /dev/null +++ b/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt @@ -0,0 +1,81 @@ + + +###################################################################################### +### 1) Include the sources +###################################################################################### + +INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) +INCLUDE_DIRECTORIES(${ParadisEO-MO_SOURCE_DIR}/src) +INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) +###################################################################################### + + + +###################################################################################### +### 2) Specify where CMake can find the libraries +###################################################################################### + +IF(NOT WIN32 OR CYGWIN) + LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BINARY_DIR}/lib) +ENDIF(NOT WIN32 OR CYGWIN) + +# especially for Visual Studio +IF(WIN32 AND NOT CYGWIN) + LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE}) +ENDIF(WIN32 AND NOT CYGWIN) + +###################################################################################### + + + +###################################################################################### +### 3) Define your target(s): just an executable here +###################################################################################### + +ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp) + +ADD_DEPENDENCIES(iterated_local_search tsp) +###################################################################################### + + + +###################################################################################### +### 4) Optionnal: define your target(s)'s version: no effect for windows +###################################################################################### + +SET(ITERATEDLOCALSEARCH_VERSION ${GLOBAL_VERSION}) +SET_TARGET_PROPERTIES(iterated_local_search PROPERTIES VERSION "${ITERATEDLOCALSEARCH_VERSION}") +###################################################################################### + + + +###################################################################################### +### 5) Link the librairies for your target(s) +###################################################################################### + +TARGET_LINK_LIBRARIES(iterated_local_search tsp eo eoutils) + +###################################################################################### + + + +###################################################################################### +### 6) Windows advanced config - especially for Microsoft Visual Studio 8 +###################################################################################### + + IF(CMAKE_CXX_COMPILER MATCHES cl) + IF(NOT WITH_SHARED_LIBS) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy") + SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od") + SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2") + SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") + + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + ENDIF(NOT WITH_SHARED_LIBS) + ENDIF(CMAKE_CXX_COMPILER MATCHES cl) +###################################################################################### + diff --git a/trunk/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp b/trunk/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp new file mode 100644 index 000000000..f18a4b3ab --- /dev/null +++ b/trunk/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp @@ -0,0 +1,95 @@ +// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- + +// "iterated_local_search.cpp" + +// (c) OPAC Team, LIFL, 2003-2007 + +/* LICENCE TEXT + + Contact: paradiseo-help@lists.gforge.inria.fr +*/ + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include + +int +main (int __argc, char * __argv []) +{ + if (__argc != 2) + { + std :: cerr << "Usage : ./iterated_local_search [instance]" << std :: endl ; + return 1 ; + } + + Graph :: load (__argv [1]) ; // Instance + + Route route ; // Solution + + RouteInit init ; // Sol. Random Init. + init (route) ; + + RouteEval full_eval ; // Full. Eval. + full_eval (route) ; + + std :: cout << "[From] " << route << std :: endl ; + + /* Tools for an efficient (? :-)) + local search ! */ + + TwoOptInit two_opt_init ; // Init. + + TwoOptNext two_opt_next ; // Explorer. + + TwoOptIncrEval two_opt_incr_eval ; // Eff. eval. + + moBestImprSelect two_opt_select ; + + //moHC hill_climbing (two_opt_init, two_opt_next, two_opt_incr_eval, two_opt_select, full_eval) ; + + moGenSolContinue cont (1000) ; + + moFitComparator comparator; + + CitySwap perturbation; + + //moILS iterated_local_search (hill_climbing, cont, comparator, perturbation, full_eval) ; + //moILS iterated_local_search (two_opt_init, two_opt_next, two_opt_incr_eval, + // two_opt_select, cont, comparator, perturbation, full_eval) ; + + moGenSolContinue ts_cont (100) ; + + TwoOptTabuList tabu_list ; // Tabu List + moNoAspirCrit aspir_crit ; // Aspiration Criterion + + //moILS iterated_local_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, ts_cont, + // cont, comparator, perturbation, full_eval) ; + + TwoOptRand two_opt_rand ; // Route Random. Gen. + + moExponentialCoolingSchedule cool_sched (0.1, 0.98) ; // Exponential Cooling Schedule + + moGenSolContinue sa_cont (100) ; + + moILS iterated_local_search (two_opt_rand, two_opt_incr_eval, sa_cont, 100, cool_sched, + cont, comparator, perturbation, full_eval) ; + + iterated_local_search(route) ; + + std :: cout << "[To] " << route << std :: endl ; + + return 0 ; +} + diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/benchs/berlin52.tsp b/trunk/paradiseo-mo/tutorial/examples/tsp/benchs/berlin52.tsp new file mode 100644 index 000000000..9854458a9 --- /dev/null +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/benchs/berlin52.tsp @@ -0,0 +1,53 @@ +52 +565 575 +25 185 +345 750 +945 685 +845 655 +880 660 +25 230 +525 1000 +580 1175 +650 1130 +1605 620 +1220 580 +1465 200 +1530 5 +845 680 +725 370 +145 665 +415 635 +510 875 +560 365 +300 465 +520 585 +480 415 +835 625 +975 580 +1215 245 +1320 315 +1250 400 +660 180 +410 250 +420 555 +575 665 +1150 1160 +700 580 +685 595 +685 610 +770 610 +795 645 +720 635 +760 650 +475 960 +95 260 +875 920 +700 500 +555 815 +830 485 +1170 65 +830 610 +605 625 +595 360 +1340 725 +1740 245