Merge branch 'master' of https://github.com/cicirello/JavaPermutation…

…Tools
cicirello · Apr 2, 2021 · 26e1df1 · 26e1df1
2 parents d4bd5e2 + f877b67
commit 26e1df1
Show file tree

Hide file tree

Showing 41 changed files with 1,163 additions and 2,284 deletions.
diff --git a/docs/api/allclasses-index.html b/docs/api/allclasses-index.html
@@ -362,7 +362,8 @@ <h1 title="All&amp;nbsp;Classes" class="title">All&nbsp;Classes</h1>
 <tr id="i39" class="rowColor">
 <td class="colFirst"><a href="org/cicirello/sequences/distance/SequenceDistanceMeasurer.html" title="interface in org.cicirello.sequences.distance">SequenceDistanceMeasurer</a></td>
 <th class="colLast" scope="row">
-<div class="block">Implement this interface, SequenceDistanceMeasurer, to define a distance metric for sequences.</div>
+<div class="block">Implement this interface, SequenceDistanceMeasurer, to define 
+ a distance metric for sequences.</div>
 </th>
 </tr>
 <tr id="i40" class="altColor">

diff --git a/docs/api/index-all.html b/docs/api/index-all.html
diff --git a/docs/api/member-search-index.js b/docs/api/member-search-index.js
diff --git a/docs/api/org/cicirello/permutations/class-use/Permutation.html b/docs/api/org/cicirello/permutations/class-use/Permutation.html
@@ -415,31 +415,13 @@ <h3>Uses of <a href="../Permutation.html" title="class in org.cicirello.permutat
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>double</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">CyclicIndependentDistance.</span><code><span class="memberNameLink"><a href="../distance/CyclicIndependentDistance.html#distancef(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">distancef</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
-         <a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p2)</code></th>
-<td class="colLast">
-<div class="block">Measures the distance between two permutations, with cyclic independence:
- distance = min_{i in [0,N)} distance(p1,rotate(p2,i))</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>double</code></td>
 <th class="colSecond" scope="row"><span class="typeNameLabel">CyclicIndependentDistanceDouble.</span><code><span class="memberNameLink"><a href="../distance/CyclicIndependentDistanceDouble.html#distancef(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">distancef</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
          <a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p2)</code></th>
 <td class="colLast">
 <div class="block">Measures the distance between two permutations, with cyclic independence:
  distance = min_{i in [0,N)} distance(p1,rotate(p2,i))</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>double</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">CyclicReversalIndependentDistance.</span><code><span class="memberNameLink"><a href="../distance/CyclicReversalIndependentDistance.html#distancef(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">distancef</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
-         <a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p2)</code></th>
-<td class="colLast">
-<div class="block">Measures the distance between two permutations, with cyclic and reversal independence:
- distance = min_{i in [0,N)} { distance(p1,rotate(p2,i)), distance(p1,rotate(reverse(p2),i)) }</div>
-</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>double</code></td>
 <th class="colSecond" scope="row"><span class="typeNameLabel">CyclicReversalIndependentDistanceDouble.</span><code><span class="memberNameLink"><a href="../distance/CyclicReversalIndependentDistanceDouble.html#distancef(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">distancef</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
@@ -474,20 +456,19 @@ <h3>Uses of <a href="../Permutation.html" title="class in org.cicirello.permutat
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>double</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">PermutationDistanceMeasurerDouble.</span><code><span class="memberNameLink"><a href="../distance/PermutationDistanceMeasurerDouble.html#distancef(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">distancef</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
+<td class="colFirst"><code>default double</code></td>
+<th class="colSecond" scope="row"><span class="typeNameLabel">PermutationDistanceMeasurer.</span><code><span class="memberNameLink"><a href="../distance/PermutationDistanceMeasurer.html#distancef(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">distancef</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
          <a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p2)</code></th>
 <td class="colLast">
 <div class="block">Measures the distance between two permutations</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>double</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">ReversalIndependentDistance.</span><code><span class="memberNameLink"><a href="../distance/ReversalIndependentDistance.html#distancef(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">distancef</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
+<th class="colSecond" scope="row"><span class="typeNameLabel">PermutationDistanceMeasurerDouble.</span><code><span class="memberNameLink"><a href="../distance/PermutationDistanceMeasurerDouble.html#distancef(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">distancef</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
          <a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p2)</code></th>
 <td class="colLast">
-<div class="block">Measures the distance between two permutations, with reversal independence:
- distance = min { distance(p1,p2), distance(p1,reverse(p2)) }</div>
+<div class="block">Measures the distance between two permutations</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -501,22 +482,22 @@ <h3>Uses of <a href="../Permutation.html" title="class in org.cicirello.permutat
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>double</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">DeviationDistanceNormalized.</span><code><span class="memberNameLink"><a href="../distance/DeviationDistanceNormalized.html#normalizedDistance(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">normalizedDistance</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
+<th class="colSecond" scope="row"><span class="typeNameLabel">DeviationDistanceNormalized2005.</span><code><span class="memberNameLink"><a href="../distance/DeviationDistanceNormalized2005.html#normalizedDistance(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">normalizedDistance</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
                   <a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p2)</code></th>
 <td class="colLast">
 <div class="block">Measures the distance between two permutations, normalized to the interval [0.0, 1.0].</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>double</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">DeviationDistanceNormalized2005.</span><code><span class="memberNameLink"><a href="../distance/DeviationDistanceNormalized2005.html#normalizedDistance(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">normalizedDistance</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
+<td class="colFirst"><code>default double</code></td>
+<th class="colSecond" scope="row"><span class="typeNameLabel">NormalizedPermutationDistanceMeasurer.</span><code><span class="memberNameLink"><a href="../distance/NormalizedPermutationDistanceMeasurer.html#normalizedDistance(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">normalizedDistance</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
                   <a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p2)</code></th>
 <td class="colLast">
 <div class="block">Measures the distance between two permutations, normalized to the interval [0.0, 1.0].</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>double</code></td>
+<td class="colFirst"><code>default double</code></td>
 <th class="colSecond" scope="row"><span class="typeNameLabel">NormalizedPermutationDistanceMeasurerDouble.</span><code><span class="memberNameLink"><a href="../distance/NormalizedPermutationDistanceMeasurerDouble.html#normalizedDistance(org.cicirello.permutations.Permutation,org.cicirello.permutations.Permutation)">normalizedDistance</a></span>&#8203;(<a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p1,
                   <a href="../Permutation.html" title="class in org.cicirello.permutations">Permutation</a>&nbsp;p2)</code></th>
 <td class="colLast">