[20498] | 1 | Index: ../trunk-jpl/src/m/solve/parseresultsfrombuffer.js
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/m/solve/parseresultsfrombuffer.js (revision 19830)
|
---|
| 4 | +++ ../trunk-jpl/src/m/solve/parseresultsfrombuffer.js (revision 19831)
|
---|
| 5 | @@ -17,6 +17,7 @@
|
---|
| 6 | var counter = 0;
|
---|
| 7 | var check_nomoresteps=0;
|
---|
| 8 | var step = result['step'];
|
---|
| 9 | + var index;
|
---|
| 10 |
|
---|
| 11 | while (!MapIsEmpty(result)){
|
---|
| 12 |
|
---|
| 13 | Index: ../trunk-jpl/src/m/solve/loadresultsfrombuffer.js
|
---|
| 14 | ===================================================================
|
---|
| 15 | --- ../trunk-jpl/src/m/solve/loadresultsfrombuffer.js (revision 19830)
|
---|
| 16 | +++ ../trunk-jpl/src/m/solve/loadresultsfrombuffer.js (revision 19831)
|
---|
| 17 | @@ -13,14 +13,7 @@
|
---|
| 18 | if (MapIsEmpty(md.results)) md.results={};
|
---|
| 19 |
|
---|
| 20 | //load results onto model
|
---|
| 21 | - var array=parseresultsfrombuffer(buffer,buffersize);
|
---|
| 22 | - if (array.length==0) throw Error('No result found in binary buffer. Check for solution crash.');
|
---|
| 23 | -
|
---|
| 24 | -
|
---|
| 25 | - md.results[array[0]['SolutionType']] = array;
|
---|
| 26 | -
|
---|
| 27 | - //recover solution_type from results
|
---|
| 28 | - md.priv.solution=array['SolutionType'];
|
---|
| 29 | + return parseresultsfrombuffer(buffer,buffersize);
|
---|
| 30 | }
|
---|
| 31 | else throw Error('loadresultsfrombuffer error message: qmu results not supported yet!');
|
---|
| 32 | }
|
---|
| 33 | Index: ../trunk-jpl/src/m/solve/WriteData.js
|
---|
| 34 | ===================================================================
|
---|
| 35 | --- ../trunk-jpl/src/m/solve/WriteData.js (revision 19830)
|
---|
| 36 | +++ ../trunk-jpl/src/m/solve/WriteData.js (revision 19831)
|
---|
| 37 | @@ -7,6 +7,7 @@
|
---|
| 38 | //process options
|
---|
| 39 | var args = Array.prototype.slice.call(arguments);
|
---|
| 40 | var options = new pairoptions(args.slice(1,args.length));
|
---|
| 41 | + var enumm;
|
---|
| 42 |
|
---|
| 43 | //Get data properties
|
---|
| 44 | if (options.exist('object')){
|
---|
| 45 | @@ -273,6 +274,7 @@
|
---|
| 46 | // Usage:
|
---|
| 47 | // enumm=BuildEnum(string)
|
---|
| 48 |
|
---|
| 49 | + var index;
|
---|
| 50 | while( string.indexOf('_') !=-1){
|
---|
| 51 | index=string.indexOf('_');
|
---|
| 52 | string=string.slice(0,index)+string[index+1].toUpperCase() + string.slice(index+2);
|
---|
| 53 | Index: ../trunk-jpl/src/m/solve/solve.js
|
---|
| 54 | ===================================================================
|
---|
| 55 | --- ../trunk-jpl/src/m/solve/solve.js (revision 19830)
|
---|
| 56 | +++ ../trunk-jpl/src/m/solve/solve.js (revision 19831)
|
---|
| 57 | @@ -188,7 +188,9 @@
|
---|
| 58 | var outputbuffer = outputs[0]; var outputbuffersize = outputs[1];
|
---|
| 59 |
|
---|
| 60 | //Load results:
|
---|
| 61 | - loadresultsfrombuffer(md,outputbuffer,outputbuffersize);
|
---|
| 62 | + var results = loadresultsfrombuffer(md,outputbuffer,outputbuffersize); //loadresults: [array,solution_type]
|
---|
| 63 |
|
---|
| 64 | + return results;
|
---|
| 65 | +
|
---|
| 66 | }
|
---|
| 67 | }
|
---|