[jboss-svn-commits] JBL Code SVN: r30822 - in labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US: Chapter-Local_search and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 25 09:00:31 EST 2009
Author: ge0ffrey
Date: 2009-12-25 09:00:30 -0500 (Fri, 25 Dec 2009)
New Revision: 30822
Modified:
labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Section-Benchmarking_and_tweaking.xml
labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Local_search/Section-Local_search.xml
labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Planner_configuration/Section-Planner_configuration.xml
Log:
rename accepter to acceptor
Modified: labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Section-Benchmarking_and_tweaking.xml
===================================================================
--- labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Section-Benchmarking_and_tweaking.xml 2009-12-25 13:19:43 UTC (rev 30821)
+++ labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Section-Benchmarking_and_tweaking.xml 2009-12-25 14:00:30 UTC (rev 30822)
@@ -65,34 +65,34 @@
<solverBenchmark>
<name>Solution tabu</name>
<localSearchSolver>
- <accepter>
+ <acceptor>
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
- </accepter>
+ </acceptor>
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
<name>Move tabu 5</name>
<localSearchSolver>
- <accepter>
+ <acceptor>
<completeMoveTabuSize>5</completeMoveTabuSize>
- </accepter>
+ </acceptor>
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
<name>Move tabu 7</name>
<localSearchSolver>
- <accepter>
+ <acceptor>
<completeMoveTabuSize>7</completeMoveTabuSize>
- </accepter>
+ </acceptor>
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
<name>Solution tabu and move tabu 7</name>
<localSearchSolver>
- <accepter>
+ <acceptor>
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
<completeMoveTabuSize>7</completeMoveTabuSize>
- </accepter>
+ </acceptor>
</localSearchSolver>
</solverBenchmark>
</solverBenchmarkSuite></programlisting>
Modified: labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Local_search/Section-Local_search.xml
===================================================================
--- labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Local_search/Section-Local_search.xml 2009-12-25 13:19:43 UTC (rev 30821)
+++ labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Local_search/Section-Local_search.xml 2009-12-25 14:00:30 UTC (rev 30822)
@@ -407,7 +407,7 @@
</listitem>
<listitem>
- <para>An <emphasis>accepter</emphasis> which filters out unacceptable moves. It can also weigh a move it
+ <para>An <emphasis>acceptor</emphasis> which filters out unacceptable moves. It can also weigh a move it
accepts.</para>
</listitem>
@@ -426,7 +426,7 @@
</mediaobject>
</figure>
- <para>In the above example the selector generated the moves shown with the blue lines, the accepter accepted all of
+ <para>In the above example the selector generated the moves shown with the blue lines, the acceptor accepted all of
them and the forager picked the move <emphasis>B0 to B3</emphasis>.</para>
<para>If we turn on DEBUG logging, we can see the decision making in the log:</para>
@@ -467,17 +467,17 @@
</section>
<section>
- <title>Accepter</title>
+ <title>Acceptor</title>
- <para>An accepter is used (together with a forager) to active tabu search, simulated annealing, great deluge, ...
+ <para>An acceptor is used (together with a forager) to active tabu search, simulated annealing, great deluge, ...
For each move it generates an accept chance. If a move is rejected it is given an accept chance of
<literal>0.0</literal>.</para>
- <para>You can implement your own <literal>Accepter</literal>, although the build-in accepters should suffice for
- most needs. You can also combine multiple accepters.</para>
+ <para>You can implement your own <literal>Acceptor</literal>, although the build-in acceptors should suffice for
+ most needs. You can also combine multiple acceptors.</para>
<section>
- <title>Tabu search accepter</title>
+ <title>Tabu search acceptor</title>
<para>When tabu search takes steps it creates tabu's. It does not accept a move as the next step if that move
breaks tabu. Drools Planner implements several tabu types:</para>
@@ -489,35 +489,35 @@
recommend this type of tabu because it tends to give the best results and requires little or no
tweaking.</para>
- <programlisting> <accepter>
+ <programlisting> <acceptor>
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
- </accepter></programlisting>
+ </acceptor></programlisting>
</listitem>
<listitem>
<para><emphasis>Move tabu</emphasis> makes recent steps tabu. It does not accept a move equal to one of
those steps.</para>
- <programlisting> <accepter>
+ <programlisting> <acceptor>
<completeMoveTabuSize>1000</completeMoveTabuSize>
- </accepter></programlisting>
+ </acceptor></programlisting>
</listitem>
<listitem>
<para><emphasis>Undo move tabu </emphasis>makes the undo move of recent steps tabu.</para>
- <programlisting> <accepter>
+ <programlisting> <acceptor>
<completeUndoMoveTabuSize>1000</completeUndoMoveTabuSize>
- </accepter></programlisting>
+ </acceptor></programlisting>
</listitem>
<listitem>
<para><emphasis>Property tabu</emphasis> makes a property of recent steps tabu. For example, it can make the
queen tabu, so that a recently moved queen can't be moved.</para>
- <programlisting> <accepter>
+ <programlisting> <acceptor>
<completePropertyTabuSize>1000</completePropertyTabuSize>
- </accepter></programlisting>
+ </acceptor></programlisting>
<para>To use property tabu, your moves must implement the <literal>TabuPropertyEnabled</literal> interface,
for example:</para>
@@ -539,21 +539,21 @@
<para>You can even combine tabu types:</para>
- <programlisting> <accepter>
+ <programlisting> <acceptor>
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
<completeUndoMoveTabuSize>10</completeUndoMoveTabuSize>
- </accepter></programlisting>
+ </acceptor></programlisting>
<para>If you pick a too small tabu size, your solver can still get stuck in a local optimum. On the other hand,
with the exception of solution tabu, if you pick a too large tabu size, your solver can get stuck by bouncing of
the walls. Use the benchmarker to fine tweak your configuration.</para>
- <para>A tabu search accepter should be combined with a <emphasis>maximum score of all</emphasis> or
+ <para>A tabu search acceptor should be combined with a <emphasis>maximum score of all</emphasis> or
<emphasis>first best score improving</emphasis> forager.</para>
</section>
<section>
- <title>Simulated annealing accepter</title>
+ <title>Simulated annealing acceptor</title>
<para>Simulated annealing does not pick the move with the highest score, neither does it evaluate all moves. At
least at first.</para>
@@ -562,7 +562,7 @@
<emphasis>temperature</emphasis> is relative to how long it has been solving. In the end, it gradually turns
into a simple local search, only accepting improving moves.</para>
- <para>A simulated annealing accepter should be combined with a <emphasis>first randomly accepted</emphasis>
+ <para>A simulated annealing acceptor should be combined with a <emphasis>first randomly accepted</emphasis>
forager.</para>
</section>
</section>
Modified: labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Planner_configuration/Section-Planner_configuration.xml
===================================================================
--- labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Planner_configuration/Section-Planner_configuration.xml 2009-12-25 13:19:43 UTC (rev 30821)
+++ labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Planner_configuration/Section-Planner_configuration.xml 2009-12-25 14:00:30 UTC (rev 30822)
@@ -259,9 +259,9 @@
<selector>
<moveFactoryClass>org.drools.planner.examples.nqueens.solver.NQueensMoveFactory</moveFactoryClass>
</selector>
- <accepter>
+ <acceptor>
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
- </accepter>
+ </acceptor>
<forager>
<foragerType>MAX_SCORE_OF_ALL</foragerType>
</forager>
More information about the jboss-svn-commits
mailing list