corner case issues

faustedition · Oct 15, 2019 · 7ef8a8c · 7ef8a8c
1 parent e220e4a
commit 7ef8a8c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/macrogen/graph.py b/src/macrogen/graph.py
@@ -298,7 +298,7 @@ def baseline_order(self) -> pd.Series:
                              if isinstance(ref, SplitReference) and ref.side == Side.END]
         else:
             unsorted_refs = [node for node in self.dag.nodes if isinstance(node, Reference)]
-        refs = sorted(unsorted_refs, key=self._secondary_key)
+        refs = sorted(unsorted_refs, key=lambda ref: ref.sort_tuple()[1:])
         return pd.Series(index=refs, data=range(1, len(refs) + 1))
 
     def spearman_rank_correlation(self) -> float:
@@ -331,7 +331,7 @@ def add_missing_wits(self, working: nx.MultiDiGraph):
         all_wits = {wit for wit in Witness.database.values() if isinstance(wit, Witness)}
         if any(isinstance(ref, SplitReference) for ref in working.nodes):
             known_wits = {ref for ref in references(working) if isinstance(ref, Witness)}
-            mentioned_refs = {ref.reference for ref in self.base.nodes if isinstance(ref.reference, Reference)}
+            mentioned_refs = {ref.reference for ref in self.base.nodes if isinstance(ref, SplitReference)}
             inscription_bases = {inscr.witness for inscr in mentioned_refs if isinstance(inscr, Inscription)}
             missing_wits = (all_wits | mentioned_refs | inscription_bases) - known_wits
             for wit in sorted(missing_wits, key=lambda ref: ref.sort_tuple()):

diff --git a/src/macrogen/report.py b/src/macrogen/report.py
@@ -1172,7 +1172,7 @@ def write_order_xml(graphs: MacrogenesisInfo):
     root.getroottree().write(str(order_xml), pretty_print=True)
 
     stats = graphs.year_stats()
-    data = dict(max=max(stats.values()), counts=stats)
+    data = dict(max=max(stats.values(), default=None), counts=stats)
     config.path.report_dir.mkdir(exist_ok=True, parents=True)
     with (config.path.report_dir / 'witness-stats.json').open('wt', encoding='utf-8') as out:
         json.dump(data, out)