Skip to content

Commit 430d444

Browse files
adding the other datasets for now is only done for the json case
1 parent a504e26 commit 430d444

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

smodels/experiment/expResultObj.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,16 @@ def __init__(self, path=None, databaseParticles=None):
9595
dsOrder = [dsOrder]
9696
for dsname in dsOrder:
9797
self.datasets.append(datasets[dsname])
98-
# now append the rest
99-
for dsName,ds in datasets.items():
100-
if dsName not in dsOrder:
101-
self.datasets.append ( ds )
102-
self.globalInfo.datasetOrder.append ( dsName )
98+
if type(self.globalInfo.datasetOrder)==tuple:
99+
self.globalInfo.datasetOrder = list ( self.globalInfo.datasetOrder )
100+
# now append the rest -- but only for json file case
101+
if hasJsons:
102+
for dsName,ds in datasets.items():
103+
if dsName not in dsOrder:
104+
self.datasets.append ( ds )
105+
self.globalInfo.datasetOrder.append ( dsName )
103106
if len(self.datasets) != len(dsOrder):
104-
raise SModelSExperimentError("lengths of datasets and datasetOrder mismatch")
107+
raise SModelSExperimentError( f"lengths of datasets and datasetOrder mismatch in {self.globalInfo.id}")
105108

106109
def writePickle(self, dbVersion):
107110
""" write the pickle file """

0 commit comments

Comments
 (0)