Index: ../trunk-jpl/src/m/solve/parseresultsfrombuffer.js =================================================================== --- ../trunk-jpl/src/m/solve/parseresultsfrombuffer.js (revision 19830) +++ ../trunk-jpl/src/m/solve/parseresultsfrombuffer.js (revision 19831) @@ -17,6 +17,7 @@ var counter = 0; var check_nomoresteps=0; var step = result['step']; + var index; while (!MapIsEmpty(result)){ Index: ../trunk-jpl/src/m/solve/loadresultsfrombuffer.js =================================================================== --- ../trunk-jpl/src/m/solve/loadresultsfrombuffer.js (revision 19830) +++ ../trunk-jpl/src/m/solve/loadresultsfrombuffer.js (revision 19831) @@ -13,14 +13,7 @@ if (MapIsEmpty(md.results)) md.results={}; //load results onto model - var array=parseresultsfrombuffer(buffer,buffersize); - if (array.length==0) throw Error('No result found in binary buffer. Check for solution crash.'); - - - md.results[array[0]['SolutionType']] = array; - - //recover solution_type from results - md.priv.solution=array['SolutionType']; + return parseresultsfrombuffer(buffer,buffersize); } else throw Error('loadresultsfrombuffer error message: qmu results not supported yet!'); } Index: ../trunk-jpl/src/m/solve/WriteData.js =================================================================== --- ../trunk-jpl/src/m/solve/WriteData.js (revision 19830) +++ ../trunk-jpl/src/m/solve/WriteData.js (revision 19831) @@ -7,6 +7,7 @@ //process options var args = Array.prototype.slice.call(arguments); var options = new pairoptions(args.slice(1,args.length)); + var enumm; //Get data properties if (options.exist('object')){ @@ -273,6 +274,7 @@ // Usage: // enumm=BuildEnum(string) + var index; while( string.indexOf('_') !=-1){ index=string.indexOf('_'); string=string.slice(0,index)+string[index+1].toUpperCase() + string.slice(index+2); Index: ../trunk-jpl/src/m/solve/solve.js =================================================================== --- ../trunk-jpl/src/m/solve/solve.js (revision 19830) +++ ../trunk-jpl/src/m/solve/solve.js (revision 19831) @@ -188,7 +188,9 @@ var outputbuffer = outputs[0]; var outputbuffersize = outputs[1]; //Load results: - loadresultsfrombuffer(md,outputbuffer,outputbuffersize); + var results = loadresultsfrombuffer(md,outputbuffer,outputbuffersize); //loadresults: [array,solution_type] + return results; + } }