|  | @@ -88,50 +88,50 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
 | 
											
												
													
														|  |  					String line =new String(frame.getPayload());
 |  |  					String line =new String(frame.getPayload());
 | 
											
												
													
														|  |  					LogService.addLog(pid,line);
 |  |  					LogService.addLog(pid,line);
 | 
											
												
													
														|  |  					System.out.print(new String(frame.getPayload()));
 |  |  					System.out.print(new String(frame.getPayload()));
 | 
											
												
													
														|  | -					//存储每步数据
 |  | 
 | 
											
												
													
														|  | -					if("Forrester".equals(stype)||"Branin".equals(stype)||"Rastrigin".equals(stype)
 |  | 
 | 
											
												
													
														|  | -							||"Rosenbrock".equals(stype)||"G9".equals(stype)
 |  | 
 | 
											
												
													
														|  | -					){
 |  | 
 | 
											
												
													
														|  | -						if(line.startsWith("[")){
 |  | 
 | 
											
												
													
														|  | -							MdoProComval v=null;
 |  | 
 | 
											
												
													
														|  | -							if(comvals.isEmpty()){
 |  | 
 | 
											
												
													
														|  | -								v= new MdoProComval();
 |  | 
 | 
											
												
													
														|  | -								comvals.add(v);
 |  | 
 | 
											
												
													
														|  | -							}
 |  | 
 | 
											
												
													
														|  | -							if(flag[0]){//没有结束
 |  | 
 | 
											
												
													
														|  | -								v=comvals.get(comvals.size()-1);
 |  | 
 | 
											
												
													
														|  | -							}else{
 |  | 
 | 
											
												
													
														|  | -								v= new MdoProComval();
 |  | 
 | 
											
												
													
														|  | -								comvals.add(v);
 |  | 
 | 
											
												
													
														|  | -							}
 |  | 
 | 
											
												
													
														|  | -							String[] valts = line.replace("[","").replace("]","").split(" ");
 |  | 
 | 
											
												
													
														|  | -							valNSiz[0] = valts.length;
 |  | 
 | 
											
												
													
														|  | -							List<String> valtsl = Arrays.asList(valts);
 |  | 
 | 
											
												
													
														|  | -							vals[0].addAll(valtsl);
 |  | 
 | 
											
												
													
														|  | -						}
 |  | 
 | 
											
												
													
														|  | -						if(line.startsWith(" gen =")){
 |  | 
 | 
											
												
													
														|  | -							String step = line.split("=")[1].trim();
 |  | 
 | 
											
												
													
														|  | -							MdoProComval comval=comvals.get(comvals.size()-1);;
 |  | 
 | 
											
												
													
														|  | -							comval.setId(UtilTools.getUUid());
 |  | 
 | 
											
												
													
														|  | -							comval.setPid(pid);
 |  | 
 | 
											
												
													
														|  | -							comval.setStep(step);
 |  | 
 | 
											
												
													
														|  | -							List<String> x_nL = new ArrayList<>();
 |  | 
 | 
											
												
													
														|  | -							for (int i = 0; i < valNSiz[0]; i++) {
 |  | 
 | 
											
												
													
														|  | -								x_nL.add("x"+i);
 |  | 
 | 
											
												
													
														|  | -							}
 |  | 
 | 
											
												
													
														|  | -							comval.setVars(x_nL.toString().replace("[","").replace("]",""));
 |  | 
 | 
											
												
													
														|  | -							comval.setVals(vals[0].toString().replace("[","").replace("]","").replace(","," "));
 |  | 
 | 
											
												
													
														|  | -							comvalDao.insert(comval);
 |  | 
 | 
											
												
													
														|  | -							vals[0] = new ArrayList<>();
 |  | 
 | 
											
												
													
														|  | -							flag[0] =false;
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -							try {
 |  | 
 | 
											
												
													
														|  | -								LogService.addLog(pid, XiJsonUtil.objectToJson(comval));
 |  | 
 | 
											
												
													
														|  | -							} catch (JsonProcessingException e) {
 |  | 
 | 
											
												
													
														|  | -								e.printStackTrace();
 |  | 
 | 
											
												
													
														|  | -							}
 |  | 
 | 
											
												
													
														|  | -						}
 |  | 
 | 
											
												
													
														|  | -					}
 |  | 
 | 
											
												
													
														|  | 
 |  | +//					//存储每步数据
 | 
											
												
													
														|  | 
 |  | +//					if("Forrester".equals(stype)||"Branin".equals(stype)||"Rastrigin".equals(stype)
 | 
											
												
													
														|  | 
 |  | +//							||"Rosenbrock".equals(stype)||"G9".equals(stype)
 | 
											
												
													
														|  | 
 |  | +//					){
 | 
											
												
													
														|  | 
 |  | +//						if(line.startsWith("[")){
 | 
											
												
													
														|  | 
 |  | +//							MdoProComval v=null;
 | 
											
												
													
														|  | 
 |  | +//							if(comvals.isEmpty()){
 | 
											
												
													
														|  | 
 |  | +//								v= new MdoProComval();
 | 
											
												
													
														|  | 
 |  | +//								comvals.add(v);
 | 
											
												
													
														|  | 
 |  | +//							}
 | 
											
												
													
														|  | 
 |  | +//							if(flag[0]){//没有结束
 | 
											
												
													
														|  | 
 |  | +//								v=comvals.get(comvals.size()-1);
 | 
											
												
													
														|  | 
 |  | +//							}else{
 | 
											
												
													
														|  | 
 |  | +//								v= new MdoProComval();
 | 
											
												
													
														|  | 
 |  | +//								comvals.add(v);
 | 
											
												
													
														|  | 
 |  | +//							}
 | 
											
												
													
														|  | 
 |  | +//							String[] valts = line.replace("[","").replace("]","").split(" ");
 | 
											
												
													
														|  | 
 |  | +//							valNSiz[0] = valts.length;
 | 
											
												
													
														|  | 
 |  | +//							List<String> valtsl = Arrays.asList(valts);
 | 
											
												
													
														|  | 
 |  | +//							vals[0].addAll(valtsl);
 | 
											
												
													
														|  | 
 |  | +//						}
 | 
											
												
													
														|  | 
 |  | +//						if(line.startsWith(" gen =")){
 | 
											
												
													
														|  | 
 |  | +//							String step = line.split("=")[1].trim();
 | 
											
												
													
														|  | 
 |  | +//							MdoProComval comval=comvals.get(comvals.size()-1);;
 | 
											
												
													
														|  | 
 |  | +//							comval.setId(UtilTools.getUUid());
 | 
											
												
													
														|  | 
 |  | +//							comval.setPid(pid);
 | 
											
												
													
														|  | 
 |  | +//							comval.setStep(step);
 | 
											
												
													
														|  | 
 |  | +//							List<String> x_nL = new ArrayList<>();
 | 
											
												
													
														|  | 
 |  | +//							for (int i = 0; i < valNSiz[0]; i++) {
 | 
											
												
													
														|  | 
 |  | +//								x_nL.add("x"+i);
 | 
											
												
													
														|  | 
 |  | +//							}
 | 
											
												
													
														|  | 
 |  | +//							comval.setVars(x_nL.toString().replace("[","").replace("]",""));
 | 
											
												
													
														|  | 
 |  | +//							comval.setVals(vals[0].toString().replace("[","").replace("]","").replace(","," "));
 | 
											
												
													
														|  | 
 |  | +//							comvalDao.insert(comval);
 | 
											
												
													
														|  | 
 |  | +//							vals[0] = new ArrayList<>();
 | 
											
												
													
														|  | 
 |  | +//							flag[0] =false;
 | 
											
												
													
														|  | 
 |  | +//
 | 
											
												
													
														|  | 
 |  | +//							try {
 | 
											
												
													
														|  | 
 |  | +//								LogService.addLog(pid, XiJsonUtil.objectToJson(comval));
 | 
											
												
													
														|  | 
 |  | +//							} catch (JsonProcessingException e) {
 | 
											
												
													
														|  | 
 |  | +//								e.printStackTrace();
 | 
											
												
													
														|  | 
 |  | +//							}
 | 
											
												
													
														|  | 
 |  | +//						}
 | 
											
												
													
														|  | 
 |  | +//					}
 | 
											
												
													
														|  |  					super.onNext(frame);
 |  |  					super.onNext(frame);
 | 
											
												
													
														|  |  				}
 |  |  				}
 | 
											
												
													
														|  |  				@Override
 |  |  				@Override
 |