Skip to content

Commit df60911

Browse files
committed
rolled back some changes
1 parent c58a0bd commit df60911

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

vcell-core/src/main/java/cbit/vcell/simdata/DataSetControllerImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2405,30 +2405,30 @@ public LangevinBatchResultSet getLangevinBatchResultSet(VCDataIdentifier vcdID)
24052405
VCData simData = getVCData(vcdID);
24062406
ODEDataInfo odeDataInfo = new ODEDataInfo(vcdID.getOwner(), vcdID.getID(),
24072407
simData.getDataBlockTimeStamp(ODE_DATA, 0));
2408-
// int keepAtMost = 10000;
2409-
// File functionsFile = null;
2408+
int keepAtMost = 10000;
2409+
File functionsFile = null;
24102410
LangevinBatchResultSet lbrs = new LangevinBatchResultSet(odeDataInfo);
24112411

24122412
File avg_file = simData.getLangevinFile(LangevinBatchResultSet.LangevinFileType.Avg);
24132413
if (avg_file != null && avg_file.exists()) {
24142414
// want to keep all results, so pass 0 for keepAtMost
24152415
// don't care about functions, so pass null for functionsFile
2416-
ODESimData odeSimData_avg = ODESimData.readIDADataFile(vcdID, avg_file, 0, null);
2416+
ODESimData odeSimData_avg = ODESimData.readIDADataFile(vcdID, avg_file, keepAtMost, functionsFile);
24172417
lbrs.setOdeSimDataAvg(odeSimData_avg);
24182418
}
24192419
File max_file = simData.getLangevinFile(LangevinBatchResultSet.LangevinFileType.Max);
24202420
if (max_file != null && max_file.exists()) {
2421-
ODESimData odeSimData_max = ODESimData.readIDADataFile(vcdID, max_file, 0, null);
2421+
ODESimData odeSimData_max = ODESimData.readIDADataFile(vcdID, max_file, keepAtMost, functionsFile);
24222422
lbrs.setOdeSimDataMax(odeSimData_max);
24232423
}
24242424
File min_file = simData.getLangevinFile(LangevinBatchResultSet.LangevinFileType.Min);
24252425
if (min_file != null && min_file.exists()) {
2426-
ODESimData odeSimData_min = ODESimData.readIDADataFile(vcdID, min_file, 0, null);
2426+
ODESimData odeSimData_min = ODESimData.readIDADataFile(vcdID, min_file, keepAtMost, functionsFile);
24272427
lbrs.setOdeSimDataMin(odeSimData_min);
24282428
}
24292429
File std_file = simData.getLangevinFile(LangevinBatchResultSet.LangevinFileType.Std);
24302430
if (std_file != null && std_file.exists()) {
2431-
ODESimData odeSimData_std = ODESimData.readIDADataFile(vcdID, std_file, 0, null);
2431+
ODESimData odeSimData_std = ODESimData.readIDADataFile(vcdID, std_file, keepAtMost, functionsFile);
24322432
lbrs.setOdeSimDataStd(odeSimData_std);
24332433
}
24342434

0 commit comments

Comments
 (0)