commons-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l..@apache.org
Subject svn commit: r959803 [26/32] - in /websites/production/commons/content/proper/commons-math: jacoco/ jacoco/org.apache.commons.math3.fraction/ jacoco/org.apache.commons.math3.genetics/ jacoco/org.apache.commons.math3.geometry.euclidean.threed/ jacoco/org...
Date Mon, 27 Jul 2015 19:42:10 GMT
Modified: websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ml/neuralnet/sofm/KohonenTrainingTaskTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ml/neuralnet/sofm/KohonenTrainingTaskTest.html (original)
+++ websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ml/neuralnet/sofm/KohonenTrainingTaskTest.html Mon Jul 27 19:42:09 2015
@@ -38,131 +38,131 @@
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.math3.Retry;
 <a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.math3.RetryRunner;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.math3.util.FastMath;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> org.junit.Assert;
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <strong class="jxr_keyword">import</strong> org.junit.runner.RunWith;
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * Tests for {@link KohonenTrainingTask}</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  @RunWith(RetryRunner.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/KohonenTrainingTaskTest.html">KohonenTrainingTaskTest</a> {
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>      @Test
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTravellerSalesmanSquareTourSequentialSolver() {
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>          <em class="jxr_comment">// Cities (in optimal travel order).</em>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>          <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] squareOfCities = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] {
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o0"</span>, 0, 0),
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o1"</span>, 1, 0),
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o2"</span>, 2, 0),
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o3"</span>, 3, 0),
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o4"</span>, 3, 1),
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o5"</span>, 3, 2),
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o6"</span>, 3, 3),
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o7"</span>, 2, 3),
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o8"</span>, 1, 3),
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o9"</span>, 0, 3),
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i3"</span>, 1, 2),
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i2"</span>, 2, 2),
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i1"</span>, 2, 1),
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i0"</span>, 1, 1),
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>          };
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>          <em class="jxr_comment">// Seed that allows the unit test to always succeed.</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>          <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> seed = 1245632379L;
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>          <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a> solver = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a>(squareOfCities, 2, seed);
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>          <em class="jxr_comment">// printSummary("before.travel.seq.dat", solver);</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>          solver.createSequentialTask(15000).run();
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>          <em class="jxr_comment">// printSummary("after.travel.seq.dat", solver);</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>          <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] result = solver.getCityList();
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>          Assert.assertEquals(squareOfCities.length,
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>                              uniqueCities(result).size());
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>          <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> ratio = computeTravelDistance(squareOfCities) / computeTravelDistance(result);
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>          Assert.assertEquals(1, ratio, 1e-1); <em class="jxr_comment">// We do not require the optimal travel.</em>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>      }
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>      <em class="jxr_comment">// Test can sometimes fail: Run several times.</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>      @Test
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>      @Retry
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTravellerSalesmanSquareTourParallelSolver() <strong class="jxr_keyword">throws</strong> ExecutionException {
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>          <em class="jxr_comment">// Cities (in optimal travel order).</em>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>          <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] squareOfCities = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] {
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o0"</span>, 0, 0),
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o1"</span>, 1, 0),
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o2"</span>, 2, 0),
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o3"</span>, 3, 0),
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o4"</span>, 3, 1),
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o5"</span>, 3, 2),
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o6"</span>, 3, 3),
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o7"</span>, 2, 3),
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o8"</span>, 1, 3),
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o9"</span>, 0, 3),
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i3"</span>, 1, 2),
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i2"</span>, 2, 2),
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i1"</span>, 2, 1),
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i0"</span>, 1, 1),
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>          };
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>          <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a> solver = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a>(squareOfCities, 2);
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>         <em class="jxr_comment">// printSummary("before.travel.par.dat", solver);</em>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 
-<a class="jxr_linenumber" name="L102" href="#L102">102</a>         <em class="jxr_comment">// Parallel execution.</em>
-<a class="jxr_linenumber" name="L103" href="#L103">103</a>         <strong class="jxr_keyword">final</strong> ExecutorService service = Executors.newCachedThreadPool();
-<a class="jxr_linenumber" name="L104" href="#L104">104</a>         <strong class="jxr_keyword">final</strong> Runnable[] tasks = solver.createParallelTasks(3, 5000);
-<a class="jxr_linenumber" name="L105" href="#L105">105</a>         <strong class="jxr_keyword">final</strong> List&lt;Future&lt;?&gt;&gt; execOutput = <strong class="jxr_keyword">new</strong> ArrayList&lt;Future&lt;?&gt;&gt;();
-<a class="jxr_linenumber" name="L106" href="#L106">106</a>         <em class="jxr_comment">// Run tasks.</em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>         <strong class="jxr_keyword">for</strong> (Runnable r : tasks) {
-<a class="jxr_linenumber" name="L108" href="#L108">108</a>             execOutput.add(service.submit(r));
-<a class="jxr_linenumber" name="L109" href="#L109">109</a>         }
-<a class="jxr_linenumber" name="L110" href="#L110">110</a>         <em class="jxr_comment">// Wait for completion (ignoring return value).</em>
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>             <strong class="jxr_keyword">for</strong> (Future&lt;?&gt; f : execOutput) {
-<a class="jxr_linenumber" name="L113" href="#L113">113</a>                 f.get();
-<a class="jxr_linenumber" name="L114" href="#L114">114</a>             }
-<a class="jxr_linenumber" name="L115" href="#L115">115</a>         } <strong class="jxr_keyword">catch</strong> (InterruptedException ignored) {}
-<a class="jxr_linenumber" name="L116" href="#L116">116</a>         <em class="jxr_comment">// Terminate all threads.</em>
-<a class="jxr_linenumber" name="L117" href="#L117">117</a>         service.shutdown();
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 
-<a class="jxr_linenumber" name="L119" href="#L119">119</a>         <em class="jxr_comment">// printSummary("after.travel.par.dat", solver);</em>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a>         <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] result = solver.getCityList();
-<a class="jxr_linenumber" name="L121" href="#L121">121</a>         Assert.assertEquals(squareOfCities.length,
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>                             uniqueCities(result).size());
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> ratio = computeTravelDistance(squareOfCities) / computeTravelDistance(result);
-<a class="jxr_linenumber" name="L124" href="#L124">124</a>         Assert.assertEquals(1, ratio, 1e-1); <em class="jxr_comment">// We do not require the optimal travel.</em>
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>     }
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment">     * Creates a map of the travel suggested by the solver.</em>
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment">     * @param solver Solver.</em>
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment">     * @return a 4-columns table: {@code &lt;x (neuron)&gt; &lt;y (neuron)&gt; &lt;x (city)&gt; &lt;y (city)&gt;}.</em>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>     <strong class="jxr_keyword">private</strong> String travelCoordinatesTable(<a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a> solver) {
-<a class="jxr_linenumber" name="L134" href="#L134">134</a>         <strong class="jxr_keyword">final</strong> StringBuilder s = <strong class="jxr_keyword">new</strong> StringBuilder();
-<a class="jxr_linenumber" name="L135" href="#L135">135</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">double</strong>[] c : solver.getCoordinatesList()) {
-<a class="jxr_linenumber" name="L136" href="#L136">136</a>             s.append(c[0]).append(<span class="jxr_string">" "</span>).append(c[1]).append(<span class="jxr_string">" "</span>);
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>             <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a> city = solver.getClosestCity(c[0], c[1]);
-<a class="jxr_linenumber" name="L138" href="#L138">138</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong>[] cityCoord = city.getCoordinates(); 
-<a class="jxr_linenumber" name="L139" href="#L139">139</a>             s.append(cityCoord[0]).append(<span class="jxr_string">" "</span>).append(cityCoord[1]).append(<span class="jxr_string">" "</span>);
-<a class="jxr_linenumber" name="L140" href="#L140">140</a>             s.append(<span class="jxr_string">"   # "</span>).append(city.getName()).append(<span class="jxr_string">"\n"</span>);
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>         }
-<a class="jxr_linenumber" name="L142" href="#L142">142</a>         <strong class="jxr_keyword">return</strong> s.toString();
-<a class="jxr_linenumber" name="L143" href="#L143">143</a>     }
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment">     * Compute the distance covered by the salesman, including</em>
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> <em class="jxr_javadoccomment">     * the trip back (from the last to first city).</em>
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em class="jxr_javadoccomment">     * @param cityList List of cities visited during the travel.</em>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment">     * @return the total distance.</em>
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>     <strong class="jxr_keyword">private</strong> Collection&lt;City&gt; uniqueCities(<a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] cityList) {
-<a class="jxr_linenumber" name="L153" href="#L153">153</a>         <strong class="jxr_keyword">final</strong> Set&lt;City&gt; unique = <strong class="jxr_keyword">new</strong> HashSet&lt;City&gt;();
-<a class="jxr_linenumber" name="L154" href="#L154">154</a>         <strong class="jxr_keyword">for</strong> (City c : cityList) {
-<a class="jxr_linenumber" name="L155" href="#L155">155</a>             unique.add(c);
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.math3.ml.neuralnet.sofm.KohonenTrainingTask;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.math3.util.FastMath;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> org.junit.Assert;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <strong class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <strong class="jxr_keyword">import</strong> org.junit.runner.RunWith;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * Tests for {@link KohonenTrainingTask}</em>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  @RunWith(RetryRunner.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/KohonenTrainingTaskTest.html">KohonenTrainingTaskTest</a> {
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>      @Test
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTravellerSalesmanSquareTourSequentialSolver() {
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>          <em class="jxr_comment">// Cities (in optimal travel order).</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>          <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] squareOfCities = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] {
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o0"</span>, 0, 0),
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o1"</span>, 1, 0),
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o2"</span>, 2, 0),
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o3"</span>, 3, 0),
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o4"</span>, 3, 1),
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o5"</span>, 3, 2),
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o6"</span>, 3, 3),
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o7"</span>, 2, 3),
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o8"</span>, 1, 3),
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o9"</span>, 0, 3),
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i3"</span>, 1, 2),
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i2"</span>, 2, 2),
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i1"</span>, 2, 1),
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i0"</span>, 1, 1),
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>          };
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>          <em class="jxr_comment">// Seed that allows the unit test to always succeed.</em>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>          <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> seed = 1245632379L;
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>          <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a> solver = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a>(squareOfCities, 2, seed);
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>          <em class="jxr_comment">// printSummary("before.travel.seq.dat", solver);</em>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>          <strong class="jxr_keyword">final</strong> Runnable task = solver.createSequentialTask(15000);
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>          task.run();
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>          <em class="jxr_comment">// All update attempts must be successful in the absence of concurrency.</em>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>          Assert.assertEquals(solver.getUpdateRatio(), 1, 0d);
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>          <em class="jxr_comment">// printSummary("after.travel.seq.dat", solver);</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>          <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] result = solver.getCityList();
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>          Assert.assertEquals(squareOfCities.length,
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>                              uniqueCities(result).size());
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>          <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> ratio = computeTravelDistance(squareOfCities) / computeTravelDistance(result);
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>          Assert.assertEquals(1, ratio, 1e-1); <em class="jxr_comment">// We do not require the optimal travel.</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>      }
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>      <em class="jxr_comment">// Test can sometimes fail: Run several times.</em>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>      @Test
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>      @Retry
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTravellerSalesmanSquareTourParallelSolver() <strong class="jxr_keyword">throws</strong> ExecutionException {
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>          <em class="jxr_comment">// Cities (in optimal travel order).</em>
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>          <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] squareOfCities = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] {
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o0"</span>, 0, 0),
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o1"</span>, 1, 0),
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o2"</span>, 2, 0),
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o3"</span>, 3, 0),
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o4"</span>, 3, 1),
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o5"</span>, 3, 2),
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o6"</span>, 3, 3),
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o7"</span>, 2, 3),
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o8"</span>, 1, 3),
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"o9"</span>, 0, 3),
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i3"</span>, 1, 2),
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>             <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i2"</span>, 2, 2),
+<a class="jxr_linenumber" name="L101" href="#L101">101</a>             <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i1"</span>, 2, 1),
+<a class="jxr_linenumber" name="L102" href="#L102">102</a>             <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>(<span class="jxr_string">"i0"</span>, 1, 1),
+<a class="jxr_linenumber" name="L103" href="#L103">103</a>         };
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>         <em class="jxr_comment">// Seed that allows the unit test to always succeed.</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> seed = 534712311L;
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>         <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a> solver = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a>(squareOfCities, 2, seed);
+<a class="jxr_linenumber" name="L109" href="#L109">109</a>         <em class="jxr_comment">// printSummary("before.travel.par.dat", solver);</em>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 
+<a class="jxr_linenumber" name="L111" href="#L111">111</a>         <em class="jxr_comment">// Parallel execution.</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a>         <strong class="jxr_keyword">final</strong> ExecutorService service = Executors.newCachedThreadPool();
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> numProcs = Runtime.getRuntime().availableProcessors();
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>         <strong class="jxr_keyword">final</strong> Runnable[] tasks = solver.createParallelTasks(numProcs, 5000);
+<a class="jxr_linenumber" name="L115" href="#L115">115</a>         <strong class="jxr_keyword">final</strong> List&lt;Future&lt;?&gt;&gt; execOutput = <strong class="jxr_keyword">new</strong> ArrayList&lt;Future&lt;?&gt;&gt;();
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>         <em class="jxr_comment">// Run tasks.</em>
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>         <strong class="jxr_keyword">for</strong> (Runnable r : tasks) {
+<a class="jxr_linenumber" name="L118" href="#L118">118</a>             execOutput.add(service.submit(r));
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>         }
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>         <em class="jxr_comment">// Wait for completion (ignoring return value).</em>
+<a class="jxr_linenumber" name="L121" href="#L121">121</a>         <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L122" href="#L122">122</a>             <strong class="jxr_keyword">for</strong> (Future&lt;?&gt; f : execOutput) {
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>                 f.get();
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>             }
+<a class="jxr_linenumber" name="L125" href="#L125">125</a>         } <strong class="jxr_keyword">catch</strong> (InterruptedException ignored) {}
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>         <em class="jxr_comment">// Terminate all threads.</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>         service.shutdown();
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>         <strong class="jxr_keyword">if</strong> (numProcs &gt; 1) {
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>             <em class="jxr_comment">// We expect that some update attempts will be concurrent.</em>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a>             Assert.assertTrue(solver.getUpdateRatio() &lt; 1);
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>         }
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>         <em class="jxr_comment">// printSummary("after.travel.par.dat", solver);</em>
+<a class="jxr_linenumber" name="L135" href="#L135">135</a>         <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] result = solver.getCityList();
+<a class="jxr_linenumber" name="L136" href="#L136">136</a>         Assert.assertEquals(squareOfCities.length,
+<a class="jxr_linenumber" name="L137" href="#L137">137</a>                             uniqueCities(result).size());
+<a class="jxr_linenumber" name="L138" href="#L138">138</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> ratio = computeTravelDistance(squareOfCities) / computeTravelDistance(result);
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>         Assert.assertEquals(1, ratio, 1e-1); <em class="jxr_comment">// We do not require the optimal travel.</em>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>     }
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 
+<a class="jxr_linenumber" name="L142" href="#L142">142</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment">     * Creates a map of the travel suggested by the solver.</em>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment">     * @param solver Solver.</em>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment">     * @return a 4-columns table: {@code &lt;x (neuron)&gt; &lt;y (neuron)&gt; &lt;x (city)&gt; &lt;y (city)&gt;}.</em>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L148" href="#L148">148</a>     <strong class="jxr_keyword">private</strong> String travelCoordinatesTable(<a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a> solver) {
+<a class="jxr_linenumber" name="L149" href="#L149">149</a>         <strong class="jxr_keyword">final</strong> StringBuilder s = <strong class="jxr_keyword">new</strong> StringBuilder();
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">double</strong>[] c : solver.getCoordinatesList()) {
+<a class="jxr_linenumber" name="L151" href="#L151">151</a>             s.append(c[0]).append(<span class="jxr_string">" "</span>).append(c[1]).append(<span class="jxr_string">" "</span>);
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>             <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a> city = solver.getClosestCity(c[0], c[1]);
+<a class="jxr_linenumber" name="L153" href="#L153">153</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong>[] cityCoord = city.getCoordinates(); 
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>             s.append(cityCoord[0]).append(<span class="jxr_string">" "</span>).append(cityCoord[1]).append(<span class="jxr_string">" "</span>);
+<a class="jxr_linenumber" name="L155" href="#L155">155</a>             s.append(<span class="jxr_string">"   # "</span>).append(city.getName()).append(<span class="jxr_string">"\n"</span>);
 <a class="jxr_linenumber" name="L156" href="#L156">156</a>         }
-<a class="jxr_linenumber" name="L157" href="#L157">157</a>         <strong class="jxr_keyword">return</strong> unique;
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>         <strong class="jxr_keyword">return</strong> s.toString();
 <a class="jxr_linenumber" name="L158" href="#L158">158</a>     }
 <a class="jxr_linenumber" name="L159" href="#L159">159</a> 
 <a class="jxr_linenumber" name="L160" href="#L160">160</a>     <em class="jxr_javadoccomment">/**</em>
@@ -172,48 +172,63 @@
 <a class="jxr_linenumber" name="L164" href="#L164">164</a> <em class="jxr_javadoccomment">     * @param cityList List of cities visited during the travel.</em>
 <a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_javadoccomment">     * @return the total distance.</em>
 <a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">double</strong> computeTravelDistance(<a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] cityList) {
-<a class="jxr_linenumber" name="L168" href="#L168">168</a>         <strong class="jxr_keyword">double</strong> dist = 0;
-<a class="jxr_linenumber" name="L169" href="#L169">169</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; cityList.length; i++) {
-<a class="jxr_linenumber" name="L170" href="#L170">170</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong>[] currentCoord = cityList[i].getCoordinates();
-<a class="jxr_linenumber" name="L171" href="#L171">171</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong>[] nextCoord = cityList[(i + 1) % cityList.length].getCoordinates();
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 
-<a class="jxr_linenumber" name="L173" href="#L173">173</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> xDiff = currentCoord[0] - nextCoord[0];
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> yDiff = currentCoord[1] - nextCoord[1];
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> 
-<a class="jxr_linenumber" name="L176" href="#L176">176</a>             dist += FastMath.sqrt(xDiff * xDiff + yDiff * yDiff);
-<a class="jxr_linenumber" name="L177" href="#L177">177</a>         }
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 
-<a class="jxr_linenumber" name="L179" href="#L179">179</a>         <strong class="jxr_keyword">return</strong> dist;
-<a class="jxr_linenumber" name="L180" href="#L180">180</a>     }
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> 
-<a class="jxr_linenumber" name="L182" href="#L182">182</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_javadoccomment">     * Prints a summary of the current state of the solver to the</em>
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> <em class="jxr_javadoccomment">     * given filename.</em>
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> <em class="jxr_javadoccomment">     * @param filename File.</em>
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> <em class="jxr_javadoccomment">     * @param solver Solver.</em>
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L189" href="#L189">189</a>     @SuppressWarnings(<span class="jxr_string">"unused"</span>)
-<a class="jxr_linenumber" name="L190" href="#L190">190</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> printSummary(String filename,
-<a class="jxr_linenumber" name="L191" href="#L191">191</a>                               <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a> solver) {
-<a class="jxr_linenumber" name="L192" href="#L192">192</a>         PrintWriter out = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L193" href="#L193">193</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L194" href="#L194">194</a>             out = <strong class="jxr_keyword">new</strong> PrintWriter(filename);
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>             out.println(travelCoordinatesTable(solver));
+<a class="jxr_linenumber" name="L167" href="#L167">167</a>     <strong class="jxr_keyword">private</strong> Collection&lt;City&gt; uniqueCities(<a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] cityList) {
+<a class="jxr_linenumber" name="L168" href="#L168">168</a>         <strong class="jxr_keyword">final</strong> Set&lt;City&gt; unique = <strong class="jxr_keyword">new</strong> HashSet&lt;City&gt;();
+<a class="jxr_linenumber" name="L169" href="#L169">169</a>         <strong class="jxr_keyword">for</strong> (City c : cityList) {
+<a class="jxr_linenumber" name="L170" href="#L170">170</a>             unique.add(c);
+<a class="jxr_linenumber" name="L171" href="#L171">171</a>         }
+<a class="jxr_linenumber" name="L172" href="#L172">172</a>         <strong class="jxr_keyword">return</strong> unique;
+<a class="jxr_linenumber" name="L173" href="#L173">173</a>     }
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> 
+<a class="jxr_linenumber" name="L175" href="#L175">175</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment">     * Compute the distance covered by the salesman, including</em>
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment">     * the trip back (from the last to first city).</em>
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment">     * @param cityList List of cities visited during the travel.</em>
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment">     * @return the total distance.</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">double</strong> computeTravelDistance(<a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] cityList) {
+<a class="jxr_linenumber" name="L183" href="#L183">183</a>         <strong class="jxr_keyword">double</strong> dist = 0;
+<a class="jxr_linenumber" name="L184" href="#L184">184</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; cityList.length; i++) {
+<a class="jxr_linenumber" name="L185" href="#L185">185</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong>[] currentCoord = cityList[i].getCoordinates();
+<a class="jxr_linenumber" name="L186" href="#L186">186</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong>[] nextCoord = cityList[(i + 1) % cityList.length].getCoordinates();
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> xDiff = currentCoord[0] - nextCoord[0];
+<a class="jxr_linenumber" name="L189" href="#L189">189</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> yDiff = currentCoord[1] - nextCoord[1];
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> 
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>             dist += FastMath.sqrt(xDiff * xDiff + yDiff * yDiff);
+<a class="jxr_linenumber" name="L192" href="#L192">192</a>         }
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> 
+<a class="jxr_linenumber" name="L194" href="#L194">194</a>         <strong class="jxr_keyword">return</strong> dist;
+<a class="jxr_linenumber" name="L195" href="#L195">195</a>     }
 <a class="jxr_linenumber" name="L196" href="#L196">196</a> 
-<a class="jxr_linenumber" name="L197" href="#L197">197</a>             <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] result = solver.getCityList();
-<a class="jxr_linenumber" name="L198" href="#L198">198</a>             out.println(<span class="jxr_string">"# Number of unique cities: "</span> + uniqueCities(result).size());
-<a class="jxr_linenumber" name="L199" href="#L199">199</a>             out.println(<span class="jxr_string">"# Travel distance: "</span> + computeTravelDistance(result));
-<a class="jxr_linenumber" name="L200" href="#L200">200</a>         } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="L201" href="#L201">201</a>             <em class="jxr_comment">// Do nothing.</em>
-<a class="jxr_linenumber" name="L202" href="#L202">202</a>         } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="L203" href="#L203">203</a>             <strong class="jxr_keyword">if</strong> (out != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L204" href="#L204">204</a>                 out.close();
-<a class="jxr_linenumber" name="L205" href="#L205">205</a>             }
-<a class="jxr_linenumber" name="L206" href="#L206">206</a>         }
-<a class="jxr_linenumber" name="L207" href="#L207">207</a>     }
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> }
+<a class="jxr_linenumber" name="L197" href="#L197">197</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em class="jxr_javadoccomment">     * Prints a summary of the current state of the solver to the</em>
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment">     * given filename.</em>
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> <em class="jxr_javadoccomment">     * @param filename File.</em>
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> <em class="jxr_javadoccomment">     * @param solver Solver.</em>
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L204" href="#L204">204</a>     @SuppressWarnings(<span class="jxr_string">"unused"</span>)
+<a class="jxr_linenumber" name="L205" href="#L205">205</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> printSummary(String filename,
+<a class="jxr_linenumber" name="L206" href="#L206">206</a>                               <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">TravellingSalesmanSolver</a> solver) {
+<a class="jxr_linenumber" name="L207" href="#L207">207</a>         PrintWriter out = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L208" href="#L208">208</a>         <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L209" href="#L209">209</a>             out = <strong class="jxr_keyword">new</strong> PrintWriter(filename);
+<a class="jxr_linenumber" name="L210" href="#L210">210</a>             out.println(travelCoordinatesTable(solver));
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> 
+<a class="jxr_linenumber" name="L212" href="#L212">212</a>             <strong class="jxr_keyword">final</strong> <a href="../../../../../../../org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.html">City</a>[] result = solver.getCityList();
+<a class="jxr_linenumber" name="L213" href="#L213">213</a>             out.println(<span class="jxr_string">"# Number of unique cities: "</span> + uniqueCities(result).size());
+<a class="jxr_linenumber" name="L214" href="#L214">214</a>             out.println(<span class="jxr_string">"# Travel distance: "</span> + computeTravelDistance(result));
+<a class="jxr_linenumber" name="L215" href="#L215">215</a>         } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="L216" href="#L216">216</a>             <em class="jxr_comment">// Do nothing.</em>
+<a class="jxr_linenumber" name="L217" href="#L217">217</a>         } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="L218" href="#L218">218</a>             <strong class="jxr_keyword">if</strong> (out != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L219" href="#L219">219</a>                 out.close();
+<a class="jxr_linenumber" name="L220" href="#L220">220</a>             }
+<a class="jxr_linenumber" name="L221" href="#L221">221</a>         }
+<a class="jxr_linenumber" name="L222" href="#L222">222</a>     }
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> }
 </pre>
 <hr/>
 <div id="footer">Copyright &#169; 2003&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>



Mime
View raw message