Skip to content

Commit 1a9e6a1

Browse files
committed
fix tutorials
1 parent 456c94c commit 1a9e6a1

4 files changed

Lines changed: 3 additions & 13 deletions

File tree

docs/html/examples.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,21 +177,19 @@ <h2>Optimise mnk-landscapes with MOEA/D<a class="headerlink" href="#optimise-mnk
177177
<span class="c1">###############################</span>
178178
<span class="c1"># Initialize the algorithm #</span>
179179
<span class="c1">###############################</span>
180-
<span class="n">number_of_objective</span> <span class="o">=</span> <span class="n">rmnk</span><span class="o">.</span><span class="n">function_numbers</span>
181180
<span class="n">number_of_weight</span> <span class="o">=</span> <span class="mi">10</span>
182181
<span class="n">number_of_weight_neighborhood</span> <span class="o">=</span> <span class="mi">20</span>
183182
<span class="n">number_of_evaluations</span> <span class="o">=</span> <span class="mi">1000</span>
184183
<span class="c1"># The file is available here : https://github.com/moead-framework/data/blob/master/weights/SOBOL-2objs-10wei.ws</span>
185184
<span class="c1"># Others weights files are available here : https://github.com/moead-framework/data/tree/master/weights</span>
186-
<span class="n">weight_file</span> <span class="o">=</span> <span class="s2">&quot;SOBOL-&quot;</span> <span class="o">+</span> <span class="nb">str</span><span class="p">(</span><span class="n">number_of_objective</span><span class="p">)</span> <span class="o">+</span> <span class="s2">&quot;objs-&quot;</span> <span class="o">+</span> <span class="nb">str</span><span class="p">(</span><span class="n">number_of_weight</span><span class="p">)</span> <span class="o">+</span> <span class="s2">&quot;wei.ws&quot;</span>
185+
<span class="n">weight_file</span> <span class="o">=</span> <span class="s2">&quot;SOBOL-&quot;</span> <span class="o">+</span> <span class="nb">str</span><span class="p">(</span><span class="n">rmnk</span><span class="o">.</span><span class="n">function_numbers</span><span class="p">)</span> <span class="o">+</span> <span class="s2">&quot;objs-&quot;</span> <span class="o">+</span> <span class="nb">str</span><span class="p">(</span><span class="n">number_of_weight</span><span class="p">)</span> <span class="o">+</span> <span class="s2">&quot;wei.ws&quot;</span>
187186

188187

189188
<span class="c1">###############################</span>
190189
<span class="c1"># Execute the algorithm #</span>
191190
<span class="c1">###############################</span>
192191
<span class="n">moead</span> <span class="o">=</span> <span class="n">Moead</span><span class="p">(</span><span class="n">problem</span><span class="o">=</span><span class="n">rmnk</span><span class="p">,</span>
193192
<span class="n">max_evaluation</span><span class="o">=</span><span class="n">number_of_evaluations</span><span class="p">,</span>
194-
<span class="n">number_of_objective</span><span class="o">=</span><span class="n">number_of_objective</span><span class="p">,</span>
195193
<span class="n">number_of_weight_neighborhood</span><span class="o">=</span><span class="n">number_of_weight_neighborhood</span><span class="p">,</span>
196194
<span class="n">weight_file</span><span class="o">=</span><span class="n">weight_file</span><span class="p">,</span>
197195
<span class="n">aggregation_function</span><span class="o">=</span><span class="n">Tchebycheff</span><span class="p">,</span>
@@ -203,7 +201,7 @@ <h2>Optimise mnk-landscapes with MOEA/D<a class="headerlink" href="#optimise-mnk
203201
<span class="c1">###############################</span>
204202
<span class="c1"># Save the result #</span>
205203
<span class="c1">###############################</span>
206-
<span class="n">save_file</span> <span class="o">=</span> <span class="s2">&quot;moead-rmnk&quot;</span> <span class="o">+</span> <span class="nb">str</span><span class="p">(</span><span class="n">number_of_objective</span><span class="p">)</span> \
204+
<span class="n">save_file</span> <span class="o">=</span> <span class="s2">&quot;moead-rmnk&quot;</span> <span class="o">+</span> <span class="nb">str</span><span class="p">(</span><span class="n">rmnk</span><span class="o">.</span><span class="n">function_numbers</span><span class="p">)</span> \
207205
<span class="o">+</span> <span class="s2">&quot;-N&quot;</span> <span class="o">+</span> <span class="nb">str</span><span class="p">(</span><span class="n">number_of_weight</span><span class="p">)</span> \
208206
<span class="o">+</span> <span class="s2">&quot;-T&quot;</span> <span class="o">+</span> <span class="nb">str</span><span class="p">(</span><span class="n">number_of_weight_neighborhood</span><span class="p">)</span> \
209207
<span class="o">+</span> <span class="s2">&quot;-iter&quot;</span> <span class="o">+</span> <span class="nb">str</span><span class="p">(</span><span class="n">number_of_evaluations</span><span class="p">)</span> \

docs/html/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/html/tuto.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,6 @@ <h2>Implement your own algorithm<a class="headerlink" href="#implement-your-own-
219219
<span class="c1"># Mandatory parameters</span>
220220
<span class="n">problem</span><span class="o">=</span><span class="n">rmnk</span><span class="p">,</span>
221221
<span class="n">max_evaluation</span> <span class="o">=</span> <span class="n">number_of_evaluations</span><span class="p">,</span>
222-
<span class="n">number_of_objective</span><span class="o">=</span><span class="n">number_of_objective</span><span class="p">,</span>
223-
<span class="n">number_of_weight</span><span class="o">=</span><span class="n">number_of_weight</span><span class="p">,</span>
224222
<span class="n">number_of_weight_neighborhood</span><span class="o">=</span><span class="n">number_of_weight_neighborhood</span><span class="p">,</span>
225223
<span class="n">weight_file</span><span class="o">=</span><span class="n">weight_file</span><span class="p">,</span>
226224
<span class="n">aggregation_function</span><span class="o">=</span><span class="n">Tchebycheff</span><span class="p">,</span>
@@ -271,8 +269,6 @@ <h2>Save data with the framework<a class="headerlink" href="#save-data-with-the-
271269
<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="n">moead</span> <span class="o">=</span> <span class="n">Moead</span><span class="p">(</span>
272270
<span class="n">problem</span><span class="o">=</span><span class="n">rmnk</span><span class="p">,</span>
273271
<span class="n">max_evaluation</span> <span class="o">=</span> <span class="n">number_of_evaluations</span><span class="p">,</span>
274-
<span class="n">number_of_objective</span><span class="o">=</span><span class="n">number_of_objective</span><span class="p">,</span>
275-
<span class="n">number_of_weight</span><span class="o">=</span><span class="n">number_of_weight</span><span class="p">,</span>
276272
<span class="n">number_of_weight_neighborhood</span><span class="o">=</span><span class="n">number_of_weight_neighborhood</span><span class="p">,</span>
277273
<span class="n">weight_file</span><span class="o">=</span><span class="n">weight_file</span><span class="p">,</span>
278274
<span class="n">aggregation_function</span><span class="o">=</span><span class="n">Tchebycheff</span>

docs/tuto.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ Example for :class:`moead_framework.algorithm.combinatorial.moead` :
6868
# Mandatory parameters
6969
problem=rmnk,
7070
max_evaluation = number_of_evaluations,
71-
number_of_objective=number_of_objective,
72-
number_of_weight=number_of_weight,
7371
number_of_weight_neighborhood=number_of_weight_neighborhood,
7472
weight_file=weight_file,
7573
aggregation_function=Tchebycheff,
@@ -135,8 +133,6 @@ If you want save all non-dominated solutions (attribute :code:`self.ep` in the a
135133
moead = Moead(
136134
problem=rmnk,
137135
max_evaluation = number_of_evaluations,
138-
number_of_objective=number_of_objective,
139-
number_of_weight=number_of_weight,
140136
number_of_weight_neighborhood=number_of_weight_neighborhood,
141137
weight_file=weight_file,
142138
aggregation_function=Tchebycheff

0 commit comments

Comments
 (0)