fixed edge case causing an issue and cleaned up some of the program flow

Author: wsavran

csep/core/catalogs.py

@@ -990,44 +990,42 @@ def read_catalog_line(line):
                         prev_id = 0
                         # if the first catalog doesn't start at zero
                         if catalog_id != prev_id:
-                            prev_id = catalog_id
                             if not empty:
-                                events.append(temp_event)
+                                events = [temp_event]
                             else:
                                 events = []
                             for id in range(catalog_id):
                                 yield cls(data=[], catalog_id=id, **kwargs)
+                            prev_id = catalog_id
+                            continue
                     # accumulate event if catalog_id is the same as previous event
                     if catalog_id == prev_id:
-                        prev_id = catalog_id
                         if not all([val in (None, '') for val in temp_event]):
                             events.append(temp_event)
+                        prev_id = catalog_id
                     # create and yield class if the events are from different catalogs
                     elif catalog_id == prev_id + 1:
-                        catalog = cls(data=events, catalog_id=prev_id, **kwargs)
-                        prev_id = catalog_id
+                        yield cls(data=events, catalog_id=prev_id, **kwargs)
                         # add event to new event list
                         if not empty:
                             events = [temp_event]
                         else:
                             events = []
-                        yield catalog
+                        prev_id = catalog_id
                     # this implies there are empty catalogs, because they are not listed in the ascii file
                     elif catalog_id > prev_id + 1:
-                        catalog = cls(data=events, catalog_id=prev_id, **kwargs)
-                        yield catalog
-                        # add event to new event list
-                        if not empty:
-                            events = [temp_event]
-                        else:
-                            events = []
+                        yield cls(data=events, catalog_id=prev_id, **kwargs)
                         # if prev_id = 0 and catalog_id = 2, then we skipped one catalog. thus, we skip catalog_id - prev_id - 1 catalogs
                         num_empty_catalogs = catalog_id - prev_id - 1
-                        # create empty catalog classes
+                        # first yield empty catalog classes
                         for id in range(num_empty_catalogs):
                             yield cls(data=[], catalog_id=catalog_id - num_empty_catalogs + id, **kwargs)
-                        # finally we want to yield the buffered catalog to preserve order
                         prev_id = catalog_id
+                        # add event to new event list
+                        if not empty:
+                            events = [temp_event]
+                        else:
+                            events = []
                     else:
                         raise ValueError(
                             "catalog_id should be monotonically increasing and events should be ordered by catalog_id")

tests/artifacts/test_ascii_catalogs/some_empty.csv

@@ -1,6 +1,4 @@
-,,,,,0,
 1,1,1,1992-01-01T0:0:0.0,1,3,1
-,,,,,4,
-,,,,,6,
+,,,,,5,
 1,1,1,1992-01-01T0:0:0.0,1,7,1
 ,,,,,9,

tests/test_forecast.py

@@ -1,7 +1,6 @@
 import os, unittest
 import numpy
 from csep import load_catalog_forecast
-from csep.core.catalogs import CSEPCatalog
 
 def get_test_catalog_root():
     root_dir = os.path.dirname(os.path.abspath(__file__))