/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision c1f24dc3

Added by Andreas Müller about 8 years ago

ID c1f24dc344945d65c1b24803faf6e810f60e5eba
Parent 1a10708d
Child 98ee943e

Some additional tests for sorting homotypical groups #3338

     package eu.etaxonomy.cdm.model.taxon;
     import java.util.Comparator;
     import java.util.HashMap;
     import java.util.HashSet;
     import java.util.Set;
     import java.util.UUID;
     import org.apache.log4j.Logger;
-...
             TaxonNameBase<?,?> name1 = taxonBase1.getName();
             TaxonNameBase<?,?> name2 = taxonBase2.getName();
     //        System.out.print(name1.getTitleCache() +" : "+ name2.getTitleCache());
     //      System.out.println(name1.getTitleCache() +" : "+ name2.getTitleCache());
             int compareStatus = compareStatus(name1, name2);
-...
                         name2.getHomotypicalGroup().getUuid().toString() :
                         taxonBase2.getUuid().toString();
                 int result = compareString1.compareTo(compareString2);
     //            System.out.println(": t" + result);
     //            System.out.println(name1.getHomotypicalGroup().getUuid());
     //            System.out.println(name2.getHomotypicalGroup().getUuid());
                 return result;
+            }
-...
                 return 1;
+            }
     //        System.out.print("_");
             //same name => compare on taxon level
             if (name1.equals(name2)){
                 return super.compare(taxonBase1, taxonBase2);  //if name is the same compare on taxon level
+            }
     //        System.out.print("_");
             TaxonNameBase<?,?> basionym1 = getPreferredInBasionymGroup(name1);
             TaxonNameBase<?,?> basionym2 = getPreferredInBasionymGroup(name2);
-...
+            }
             if (compareResult != 0){
     //            System.out.println(": " + compareResult);
     //          System.out.println(": " + compareResult);
                 return compareResult;
             }else{
                 //names are uncomparable on name level (except for uuid, id, etc.)
                 int result = super.compare(taxonBase1, taxonBase2);
     //            System.out.println(": = " + result);
     //          System.out.println(": = " + result);
                 return result;
+            }
+        }
-...
     //        }
     //        Collections.sort(candidates, this);
     //        return candidates.isEmpty() ? null : candidates.get(0);
     //    }
     //
     //    /**
     //     * @param name1
     //     * @return
     //     */
     //    private TaxonNameBase<?, ?> getFirstNameInHomotypicalGroup(TaxonNameBase<?, ?> name1) {
     //        TaxonNameBase<?, ?> prefName = getPreferredInBasionymGroup(name1);
     //        return null;
     //    }
         /**
          * Compare 2 names which have the same basionym.
          * The names must not be equal to each other but may be equal
-...
             if (basio2IsReplacedSynForBasio1 && !basio1IsReplacedSynForBasio2){
                 return 1;
             }else if (basio1IsReplacedSynForBasio2){  //&& !basio2IsReplacedSynForBasio1
             }else if (basio1IsReplacedSynForBasio2 && !basio2IsReplacedSynForBasio1){
                 return -1;
+            }
-...
+        }
         /**
          * @param name1
          * @param name
          * @return
          */
         private TaxonNameBase<?,?> getPreferredInBasionymGroup(TaxonNameBase<?,?> name) {
             HashMap<UUID, TaxonNameBase<?,?>> candidates = new HashMap<UUID, TaxonNameBase<?,?>>();
             Set<TaxonNameBase<?,?>> candidates = new HashSet<TaxonNameBase<?,?>>();
             //get all final basionyms, except for those being part of a basionym circle
             for (TaxonNameBase<?,?> candidate : name.getBasionyms()){
                 if (candidate != null && candidate.getHomotypicalGroup().equals(name.getHomotypicalGroup())){
                     candidates.put(candidate.getUuid(), candidate);
                 if (candidate != null
                         && candidate.getHomotypicalGroup().equals(name.getHomotypicalGroup())
                         && !hasBasionymCircle(candidate, null)){
                     candidate = getPreferredInBasionymGroup(candidate);
                     candidates.add(candidate);
+                }
+            }
             if (candidates.isEmpty()){
                 return name;
             }else if (candidates.size() == 1){
                 return candidates.iterator().next();
             }else{
                 TaxonNameBase<?,?> result = candidates.iterator().next();
                 candidates.remove(result);
                 for (TaxonNameBase<?,?> candidate : candidates){
                     if (super.compare(result, candidate) > 0){
                         result = candidate;
+                    }
+                }
                 return result;
+            }
+        }
         /**
          * @param candidate
          * @return
          */
         private boolean hasBasionymCircle(TaxonNameBase<?, ?> name, Set<TaxonNameBase<?,?>> existing) {
             if (existing == null){
                 existing = new HashSet<TaxonNameBase<?,?>>();
+            }
             if (existing.contains(name)){
                 return true;
             }else{
                 return candidates.get(candidates.keySet().iterator().next());
                 Set<TaxonNameBase> basionyms = name.getBasionyms();
                 if (basionyms.isEmpty()){
                     return false;
+                }
                 existing.add(name);
                 for (TaxonNameBase basionym : basionyms){
                     if (hasBasionymCircle(basionym, existing)){
                         return true;
+                    }
+                }
                 return false;
+            }
+        }

         @Test
         public void testCompare_NoCircularProblemsWithBasionyms() {
             //TODO not yet fully implemented
             taxon1.addHomotypicSynonymName(botName3, null, null);
             taxon1.addHomotypicSynonymName(botName5, null, null);
             botName3.addBasionym(botName5);
     //        taxon1.addHomotypicSynonymName(botName2, null, null);
     //        taxon1.addHomotypicSynonymName(botName4, null, null);
     //        botName2.addBasionym(botName4);
             Assert.assertEquals(botName1.getHomotypicalGroup(), botName5.getHomotypicalGroup());
             botName5.addBasionym(botName1);
             botName1.addBasionym(botName3);
-...
             list.add(taxon1);
             Collections.sort(list, new HomotypicGroupTaxonComparator(null));
     //        Assert.assertEquals(botName1, list.get(0).getName());
     //        Assert.assertEquals(botName3, list.get(1).getName());
     //        Assert.assertEquals(botName5, list.get(2).getName());
             Assert.assertEquals(botName1, list.get(0).getName());
             Assert.assertEquals(botName3, list.get(1).getName());
             Assert.assertEquals(botName5, list.get(2).getName());
             //additional basionym for botName3
             taxon1.addHomotypicSynonymName(botName2, null, null);
             Assert.assertEquals(botName1.getHomotypicalGroup(), botName2.getHomotypicalGroup());
             botName3.addBasionym(botName2);
             list.clear();
             list.addAll(taxon1.getSynonyms());
             list.add(taxon1);
             Collections.sort(list, new HomotypicGroupTaxonComparator(null));
             Assert.assertEquals(botName1, list.get(0).getName());
             Assert.assertEquals(botName2, list.get(1).getName());
             Assert.assertEquals(botName3, list.get(2).getName());
             Assert.assertEquals(botName5, list.get(3).getName());
+        }

Also available in: Unified diff

Project

General

Profile

EDIT

Revision c1f24dc3

Added by Andreas Müller about 8 years ago