去除Rate of growth，补充提交之前修改 (#111)

Author: hyt2002

data/caption/caption_2nd/params.py

@@ -32,6 +32,12 @@
 
 proloculus_shape_classes = {"spherical": [0, 0.33], "normal": [0.33, 0.67], "kidney-shaped": [0.67, 1]}
 
+volution_coiled_classes = {
+    "tightly coiled": [0, 0.150],
+    "moderately coiled": [0.150, 0.2],
+    "lossely expanded": [0.2, 999],
+}
+
 tunnel_angle_classes = {"narrow": [0, 20], "moderate": [21, 30], "broad": [31, 99]}
 
 chomata_size_classes = {"small": [0, 0.06], "moderate": [0.06, 0.1], "massive": [0.1, 9999]}

data/caption/caption_2nd/volution.py

@@ -64,19 +64,58 @@ def genVolutionHeightAndGrowthRate(self):
             return ""
         txt += txt1
         self.chamber_heights = txt1
-        txt += "Rates of growth of {start} to {end} volution are ".format(
-            start=ordinal_numbers[1], end=ordinal_numbers[len(self.volutions_table) - 1]
-        )
+        self.growth_rate_raw = []
+        # txt += "Rates of growth of {start} to {end} volution are ".format(
+        #     start=ordinal_numbers[1], end=ordinal_numbers[len(self.volutions_table) - 1]
+        # )
         for i in range(len(heights) - 1):
             txt2 += str(round(heights[i + 1] / heights[i], 1))
+            self.growth_rate_raw.append(heights[i + 1] - heights[i])
             if i != len(heights) - 2:
                 txt2 += ", "
             else:
                 txt2 += ". "
-        txt += txt2
-        self.growth_rate = txt2
+        # txt += txt2
+        # self.growth_rate = txt2
+        self.growth_rate = None
+        txt += f"Volutions {self.getCoiled()}. "
         return txt
 
+    def processTwo(self, inner, outer):
+        if "moderate" in inner[0]:
+            return f"{outer[0]} in outer volutions"
+        elif "moderate" in outer[0]:
+            return f"{inner[0]} in first {inner[1] + 2} volutions"
+        else:
+            return f"{inner[0]} in first {inner[1] + 2} volutions while {outer[0]} in outer volutions"
+
+    def getCoiled(self):
+        coiled = [self.standardRangeFilter(volution_coiled_classes, g) for g in self.growth_rate_raw]
+        inner, outer = ["", -1], ["", -1]
+        current_modify = inner
+        # print("new sample:")
+        # print(self.chamber_heights)
+        for i, word in enumerate(coiled):
+            # print(f"{i}th loop:",inner,outer)
+            if current_modify[0] == "":
+                current_modify[0] = word
+                current_modify[1] = i
+            elif current_modify[0] != word:
+                current_modify = outer
+                current_modify[0] = word
+                current_modify[1] = i
+            else:
+                current_modify[1] = i
+        if inner[0] != "":
+            if outer[0] == "":
+                return inner[0]
+            elif outer[0] == inner[0]:
+                return inner[0]
+            else:
+                return self.processTwo(inner, outer)
+        else:
+            return "moderately coiled"
+
     def genUserInput(self):
         txt = "The number of volutions is {num}. ".format(num=self.num)
         txt += self.genVolutionHeightAndGrowthRate()