relationships update

SpeciesFileGroup · Jan 23, 2014 · 4fa8db2 · 4fa8db2
1 parent 77886ab
commit 4fa8db2
Show file tree

Hide file tree

Showing 57 changed files with 242 additions and 298 deletions.
diff --git a/app/models/taxon_name_classification/icn.rb b/app/models/taxon_name_classification/icn.rb
@@ -1,7 +1,7 @@
 class TaxonNameClassification::Icn < TaxonNameClassification
 
   def self.applicable_ranks
-    RANK_CLASS_NAMES_ICN # ICN.collect{|t| t.to_s}
+    RANK_CLASS_NAMES_ICN
   end
 
   def self.disjoint_taxon_name_classes

diff --git a/app/models/taxon_name_relationship/combination.rb b/app/models/taxon_name_relationship/combination.rb
@@ -7,18 +7,18 @@ def self.disjoint_taxon_name_relationships
         TaxonNameRelationship::Iczn,
         TaxonNameRelationship::Icn,
         TaxonNameRelationship::OriginalCombination,
-        TaxonNameRelationship::Typification) + self.collect_to_s(
-        TaxonNameRelationship::SourceClassifiedAs)
+        TaxonNameRelationship::Typification) +
+        [TaxonNameRelationship::SourceClassifiedAs.to_s]
   end
 
+  @@disjoint_classes = self.collect_descendants_to_s(TaxonNameClassification)
+
   def self.disjoint_subject_classes
-    self.collect_descendants_to_s(
-        TaxonNameClassification)
+    @@disjoint_classes
   end
 
   def self.disjoint_object_classes
-    self.collect_descendants_to_s(
-      TaxonNameClassification)
+    @@disjoint_classes
   end
 
   def self.nomenclatural_priority

diff --git a/app/models/taxon_name_relationship/icn.rb b/app/models/taxon_name_relationship/icn.rb
@@ -12,19 +12,18 @@ def self.valid_object_ranks
   end
 
   def self.disjoint_taxon_name_relationships
-    self.collect_descendants_to_s(
-        TaxonNameRelationship::Iczn,
-        TaxonNameRelationship::Combination)
+    self.collect_descendants_to_s(TaxonNameRelationship::Iczn,
+                                  TaxonNameRelationship::Combination)
   end
 
+  @@disjoint_classes = self.collect_descendants_to_s(TaxonNameClassification::Iczn)
+
   def self.disjoint_subject_classes
-    self.collect_descendants_to_s(
-        TaxonNameClassification::Iczn)
+    @@disjoint_classes
   end
 
   def self.disjoint_object_classes
-    self.collect_to_s(
-        TaxonNameClassification::Iczn::NotEffectivelyPublished)
+    @@disjoint_classes + [TaxonNameClassification::Icn::NotEffectivelyPublished.to_s]
   end
 
 end
diff --git a/app/models/taxon_name_relationship/icn/accepting.rb b/app/models/taxon_name_relationship/icn/accepting.rb
@@ -2,22 +2,22 @@ class TaxonNameRelationship::Icn::Accepting < TaxonNameRelationship::Icn
 
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_descendants_and_itself_to_s(
-        TaxonNameRelationship::Icn::Unaccepting)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_descendants_and_itself_to_s(TaxonNameRelationship::Icn::Unaccepting)
   end
 
   def self.disjoint_subject_classes
-    self.parent.disjoint_subject_classes + self.collect_to_s(
-        TaxonNameClassification::Icn::NotEffectivelyPublished) + self.collect_descendants_to_s(
+    self.parent.disjoint_subject_classes +
+        self.collect_descendants_to_s(TaxonNameClassification::Icn::NotEffectivelyPublished,
         TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
-        TaxonNameClassification::Iczn::EffectivelyPublished::ValidlyPublished::Illegitimate)
+        TaxonNameClassification::Icn::EffectivelyPublished::ValidlyPublished::Illegitimate)
   end
 
   def self.disjoint_object_classes
-    self.parent.disjoint_object_classes + self.collect_to_s(
-        TaxonNameClassification::Icn::NotEffectivelyPublished) + self.collect_descendants_to_s(
-        TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
-        TaxonNameClassification::Iczn::EffectivelyPublished::ValidlyPublished::Illegitimate)
+    self.parent.disjoint_object_classes +
+        self.collect_descendants_to_s(TaxonNameClassification::Icn::NotEffectivelyPublished,
+            TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
+            TaxonNameClassification::Icn::EffectivelyPublished::ValidlyPublished::Illegitimate)
   end
 
 end
diff --git a/app/models/taxon_name_relationship/icn/accepting/alternative_family_name.rb b/app/models/taxon_name_relationship/icn/accepting/alternative_family_name.rb
@@ -2,12 +2,12 @@ class TaxonNameRelationship::Icn::Accepting::AlternativeFamilyName < TaxonNameRe
 
   #left_side
   def self.valid_subject_ranks
-    NomenclaturalRank::Icn::FamilyGroup.descendants.collect{|t| t.to_s}
+    FAMILY_RANK_NAMES_ICN
   end
 
   # right_side
   def self.valid_object_ranks
-    NomenclaturalRank::Iczn::FamilyGroup.descendants.collect{|t| t.to_s}
+    FAMILY_RANK_NAMES_ICN
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/icn/unaccepting.rb b/app/models/taxon_name_relationship/icn/unaccepting.rb
@@ -1,15 +1,15 @@
 class TaxonNameRelationship::Icn::Unaccepting < TaxonNameRelationship::Icn
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_descendants_to_s(
-        TaxonNameRelationship::Icn::Accepting)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_descendants_to_s(TaxonNameRelationship::Icn::Accepting)
   end
 
   def self.disjoint_object_classes
-    self.parent.disjoint_object_classes + self.collect_to_s(
-        TaxonNameClassification::Icn::NotEffectivelyPublished) + self.collect_descendants_to_s(
-        TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
-        TaxonNameClassification::Iczn::EffectivelyPublished::ValidlyPublished::Illegitimate)
+    self.parent.disjoint_object_classes +
+        self.collect_descendants_to_s(TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
+            TaxonNameClassification::Icn::NotEffectivelyPublished,
+            TaxonNameClassification::Icn::EffectivelyPublished::ValidlyPublished::Illegitimate)
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/icn/unaccepting/homonym.rb b/app/models/taxon_name_relationship/icn/unaccepting/homonym.rb
@@ -1,16 +1,16 @@
 class  TaxonNameRelationship::Icn::Unaccepting::Homonym <  TaxonNameRelationship::Icn::Unaccepting
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_to_s(
-        TaxonNameRelationship::Icn::Unaccepting) + self.collect_descendants_to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Usage)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_to_s(TaxonNameRelationship::Icn::Unaccepting) +
+        self.collect_descendants_to_s(TaxonNameRelationship::Icn::Unaccepting::Usage)
   end
 
   def self.disjoint_subject_classes
-    self.parent.disjoint_subbject_classes + self.collect_to_s(
-        TaxonNameClassification::Icn::NotEffectivelyPublished) + self.collect_descandants_to_s(
-        TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
-        TaxonNameClassification::Iczn::EffectivelyPublished::ValidlyPublished::Legitimate)
+    self.parent.disjoint_subbject_classes +
+        self.collect_to_s(TaxonNameClassification::Icn::NotEffectivelyPublished) +
+        self.collect_descandants_to_s(TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
+            TaxonNameClassification::Icn::EffectivelyPublished::ValidlyPublished::Legitimate)
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/icn/unaccepting/rejected.rb b/app/models/taxon_name_relationship/icn/unaccepting/rejected.rb
diff --git a/app/models/taxon_name_relationship/icn/unaccepting/synonym.rb b/app/models/taxon_name_relationship/icn/unaccepting/synonym.rb
@@ -1,9 +1,9 @@
 class TaxonNameRelationship::Icn::Unaccepting::Synonym < TaxonNameRelationship::Icn::Unaccepting
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_to_s(
-        TaxonNameRelationship::Icn::Unaccepting) + self.collect_descendants_to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Usage)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_to_s(TaxonNameRelationship::Icn::Unaccepting) +
+        self.collect_descendants_to_s(TaxonNameRelationship::Icn::Unaccepting::Usage)
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/icn/unaccepting/synonym/heterotypic.rb b/app/models/taxon_name_relationship/icn/unaccepting/synonym/heterotypic.rb
@@ -1,9 +1,9 @@
 class TaxonNameRelationship::Icn::Unaccepting::Synonym::Heterotypic < TaxonNameRelationship::Icn::Unaccepting::Synonym
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Synonym) + self.collect_descendants.to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_to_s(TaxonNameRelationship::Icn::Unaccepting::Synonym) +
+        self.collect_descendants_and_itself_to_s(TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic)
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/icn/unaccepting/synonym/homotypic.rb b/app/models/taxon_name_relationship/icn/unaccepting/synonym/homotypic.rb
@@ -1,9 +1,9 @@
 class TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic < TaxonNameRelationship::Icn::Unaccepting::Synonym
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Synonym,
-        TaxonNameRelationship::Icn::Unaccepting::Synonym::Heterotypic)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_to_s(TaxonNameRelationship::Icn::Unaccepting::Synonym,
+            TaxonNameRelationship::Icn::Unaccepting::Synonym::Heterotypic)
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/icn/unaccepting/synonym/homotypic/alternative_name.rb b/app/models/taxon_name_relationship/icn/unaccepting/synonym/homotypic/alternative_name.rb
@@ -1,10 +1,10 @@
 class TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::AlternativeName < TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic,
-        TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::Isonym,
-        TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::OrthographicVariant)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_to_s(TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic,
+            TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::Isonym,
+            TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::OrthographicVariant)
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/icn/unaccepting/synonym/homotypic/isonym.rb b/app/models/taxon_name_relationship/icn/unaccepting/synonym/homotypic/isonym.rb
@@ -1,10 +1,10 @@
 class TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::Isonym < TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic,
-        TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::AlternativeName,
-        TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::OrthographicVariant)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_to_s(TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic,
+            TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::AlternativeName,
+            TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::OrthographicVariant)
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/icn/unaccepting/synonym/homotypic/orthographic_variant.rb b/app/models/taxon_name_relationship/icn/unaccepting/synonym/homotypic/orthographic_variant.rb
@@ -1,10 +1,10 @@
 class TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::OrthographicVariant < TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic,
-        TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::AlternativeName,
-        TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::Isonym)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_to_s(TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic,
+            TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::AlternativeName,
+            TaxonNameRelationship::Icn::Unaccepting::Synonym::Homotypic::Isonym)
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/icn/unaccepting/usage.rb b/app/models/taxon_name_relationship/icn/unaccepting/usage.rb
@@ -1,11 +1,10 @@
 class TaxonNameRelationship::Icn::Unaccepting::Usage < TaxonNameRelationship::Icn::Unaccepting
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_to_s(
-        TaxonNameRelationship::Icn::Unaccepting,
-        TaxonNameRelationship::Icn::Unaccepting::Homonym,
-        TaxonNameRelationship::Icn::Unaccepting::Rejected) + self.collect_descendants_and_itself_to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Synonym)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_to_s(TaxonNameRelationship::Icn::Unaccepting,
+            TaxonNameRelationship::Icn::Unaccepting::Homonym) +
+        self.collect_descendants_and_itself_to_s(TaxonNameRelationship::Icn::Unaccepting::Synonym)
   end
 
 end
diff --git a/app/models/taxon_name_relationship/icn/unaccepting/usage/basionym.rb b/app/models/taxon_name_relationship/icn/unaccepting/usage/basionym.rb
@@ -1,16 +1,16 @@
 class TaxonNameRelationship::Icn::Unaccepting::Usage::Basionym < TaxonNameRelationship::Icn::Unaccepting::Usage
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Usage::Misspelling,
-        TaxonNameRelationship::Icn::Unaccepting::Usage::Misapplication)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_to_s(TaxonNameRelationship::Icn::Unaccepting::Usage::Misspelling,
+            TaxonNameRelationship::Icn::Unaccepting::Usage::Misapplication)
   end
 
   def self.disjoint_subject_classes
-    self.parent.disjoint_subject_classes + self.collect_to_s(
-        TaxonNameClassification::Icn::NotEffectivelyPublished) + self.collect_descendants_to_s(
-        TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
-        TaxonNameClassification::Iczn::EffectivelyPublished::ValidlyPublished::Illegitimate)
+    self.parent.disjoint_subject_classes +
+        self.collect_to_s(TaxonNameClassification::Icn::NotEffectivelyPublished) +
+        self.collect_descendants_and_itself_to_s(TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
+            TaxonNameClassification::Iczn::EffectivelyPublished::ValidlyPublished::Illegitimate)
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/icn/unaccepting/usage/misapplication.rb b/app/models/taxon_name_relationship/icn/unaccepting/usage/misapplication.rb
@@ -1,16 +1,16 @@
 class TaxonNameRelationship::Icn::Unaccepting::Usage::Misapplication < TaxonNameRelationship::Icn::Unaccepting::Usage
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Usage::Basionym,
-        TaxonNameRelationship::Icn::Unaccepting::Usage::Misspelling)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_to_s(TaxonNameRelationship::Icn::Unaccepting::Usage::Basionym,
+            TaxonNameRelationship::Icn::Unaccepting::Usage::Misspelling)
   end
 
   def self.disjoint_subject_classes
-    self.parent.disjoint_subject_classes + self.collect_to_s(
-        TaxonNameClassification::Icn::NotEffectivelyPublished) + self.collect_descendants_to_s(
-        TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
-        TaxonNameClassification::Iczn::EffectivelyPublished::ValidlyPublished::Illegitimate)
+    self.parent.disjoint_subject_classes +
+        self.collect_to_s(TaxonNameClassification::Icn::NotEffectivelyPublished) +
+        self.collect_descendants_and_itself_to_s(TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
+            TaxonNameClassification::Iczn::EffectivelyPublished::ValidlyPublished::Illegitimate)
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/icn/unaccepting/usage/misspelling.rb b/app/models/taxon_name_relationship/icn/unaccepting/usage/misspelling.rb
@@ -1,18 +1,18 @@
 class TaxonNameRelationship::Icn::Unaccepting::Usage::Misspelling < TaxonNameRelationship::Icn::Unaccepting::Usage
 
   def self.disjoint_taxon_name_relationships
-    self.parent.disjoint_taxon_name_relationships + self.collect_to_s(
-        TaxonNameRelationship::Icn::Unaccepting::Usage::Basionym,
-        TaxonNameRelationship::Icn::Unaccepting::Usage::Misapplication)
+    self.parent.disjoint_taxon_name_relationships +
+        self.collect_to_s(TaxonNameRelationship::Icn::Unaccepting::Usage::Basionym,
+            TaxonNameRelationship::Icn::Unaccepting::Usage::Misapplication)
   end
 
   def self.disjoint_subject_classes
-    self.parent.disjoint_subject_classes + self.collect_descendants_to_s(
-        TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
-        TaxonNameClassification::Icn::EffectivelyPublished::ValidlyPublished.Legitimate) + self.collect_to_s(
-        TaxonNameClassification::Icn::NotEffectivelyPublished,
+    self.parent.disjoint_subject_classes +
+        self.collect_descendants_and_itself_to_s(TaxonNameClassification::Icn::EffectivelyPublished::InvalidlyPublished,
+            TaxonNameClassification::Icn::EffectivelyPublished::ValidlyPublished.Legitimate) +
+        self.collect_to_s(TaxonNameClassification::Icn::NotEffectivelyPublished,
         TaxonNameClassification::Iczn::EffectivelyPublished::ValidlyPublished::Illegitimate::Homonym,
-        TaxonNameClassification::Iczn::EffectivelyPublished::ValidlyPublished::Illegitimate::Seperfluous)         
+        TaxonNameClassification::Iczn::EffectivelyPublished::ValidlyPublished::Illegitimate::Seperfluous)
   end
 
   def self.subject_relationship_name

diff --git a/app/models/taxon_name_relationship/iczn.rb b/app/models/taxon_name_relationship/iczn.rb
@@ -12,19 +12,18 @@ def self.valid_object_ranks
   end
 
   def self.disjoint_taxon_name_relationships
-    self.collect_descendants_to_s(
-        TaxonNameRelationship::Icn,
-        TaxonNameRelationship::Combination)
+    self.collect_descendants_to_s(TaxonNameRelationship::Icn,
+                                  TaxonNameRelationship::Combination)
   end
 
+  @@disjoint_classes = self.collect_descendants_to_s(TaxonNameClassification::Icn)
+
   def self.disjoint_subject_classes
-    self.collect_descendants_to_s(
-        TaxonNameClassification::Icn)
+    @@disjoint_classes
   end
 
   def self.disjoint_object_classes
-    self.collect_to_s(
-        TaxonNameClassification::Icn::NotEffectivelyPublished)
+    @@disjoint_classes
   end