Author: bpoussin Date: 2014-12-22 10:19:18 +0000 (Mon, 22 Dec 2014) New Revision: 351 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/351 Log: - remove dbResult transaction commit (no more needed with ResultStorageCSV) - change TimeStep before rollback to permit export of database Modified: trunk/simulators/DefaultSimulator.java Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2014-12-18 12:20:31 UTC (rev 350) +++ trunk/simulators/DefaultSimulator.java 2014-12-22 10:19:18 UTC (rev 351) @@ -102,7 +102,7 @@ TimeStep step = control.getStep(); ResultManager resManager = context.getResultManager(); - TopiaContext db = context.getDB(); + TopiaContext db = context.getDB(); // for database init SiMatrix siMatrix = newSiMatrix(context); GravityModel gravityModel = newGravityModel(context, siMatrix); @@ -137,7 +137,7 @@ // // Commit all change done un init rules methods. // - context.getDB().commitTransaction(); + context.validateDBChanges(); // // Simulation loop @@ -174,9 +174,9 @@ if (siMatrix.getStrategies(step).size() > 0) { if (resManager.isEnabled(ResultName.MATRIX_NO_ACTIVITY)) { MatrixND mat = metierMonitor.getOrCreateNoActivity(step, - ResultName.MATRIX_NO_ACTIVITY, siMatrix + ResultName.MATRIX_NO_ACTIVITY, siMatrix .getStrategies(step), siMatrix - .getMetiers(step)); + .getMetiers(step)); resManager.addResult(step, mat); } } @@ -214,7 +214,7 @@ for (Rule rule : rules) { for (Metier metier : siMatrix.getMetiers(step)) { boolean condition = ruleMonitor.getEvalutionCondition(step, - rule, metier); + rule, metier); if (condition) { rule.preAction(context, step, metier); } @@ -343,22 +343,17 @@ } // - // revert modification for next step + // Go next step // - control.setText("Rollback rules changes"); - db.rollbackTransaction(); + // do next before rollbackTransaction to permit export to take + // current database value and export them. + step = step.next(); // - // commit result + // revert modification for next step // - control.setText("Commit results"); - TopiaContext tx = context.getDbResult(); - tx.commitTransaction(); - - // - // Go next step - // - step = step.next(); + control.setText("Rollback rules changes"); + context.rollbackRuleChanges(); } }