From a856b0db283f46b6b48086e371393d375eece1a3 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 15 八月 2024 16:15:43 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 328 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 284 insertions(+), 44 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index 880ecaf..ce8118e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -2,23 +2,28 @@
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONArray;
+import cn.hutool.json.XML;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.spire.pdf.tables.table.convert.Convert;
import com.zt.common.exception.RenException;
import com.zt.common.service.BaseService;
import com.zt.common.servlet.Result;
+import com.zt.common.utils.TreeUtils;
import com.zt.common.utils.UUIDUtil;
import com.zt.life.modules.mainPart.basicInfo.dao.ParamDataDao;
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
+import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
import com.zt.life.modules.mainPart.taskReliability.dao.*;
import com.zt.common.utils.JsonUtils2;
import com.zt.life.modules.mainPart.taskReliability.dao.SimulatAssessDao;
import com.zt.life.modules.mainPart.taskReliability.dao.TimeDiagramDao;
-import com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto;
-import com.zt.life.modules.mainPart.taskReliability.dto.TaskModelCheckResult;
+import com.zt.life.modules.mainPart.taskReliability.dto.*;
import com.zt.life.modules.mainPart.taskReliability.model.*;
+import com.zt.life.modules.mainPart.utils.GetStringSpace;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
@@ -26,7 +31,6 @@
import org.dom4j.io.XMLWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.zt.life.modules.mainPart.taskReliability.dto.StatusDto;
import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel;
@@ -37,17 +41,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
+import java.io.*;
+import java.util.*;
import java.util.stream.Collectors;
@@ -58,9 +53,10 @@
* @since 1.0.0 2024-03-20
*/
@Service
-public class SimulatAssessService extends BaseService<SimulatAssessDao, SimulatAssess> {
+public class SimulatAssessService extends BaseService<SimulatAssessDao, SimulatAssess> {
private static final Logger logger = LoggerFactory.getLogger(SimulatAssessService.class);
- private static final String RELIA_SIM_TASK_TYPE_SIMULATION = "calcreq";
+ public static final String RELIA_SIM_TASK_TYPE_SIMULATION = "calcreq";
+ public static final String RELIA_SIM_TASK_TYPE_PROGRESS = "calcprog";
@Value("${spring.redis.host}")
private String redisHost;
@@ -70,13 +66,15 @@
private String reliaSimMain;
@Value("${data.reliaSimLib.resultHome}")
private String resultHome;
+ @Value("${data.reliaSimLib.fixedRandomSeed}")
+ private String fixedRandomSeed;
@Autowired
private RedisTemplate redisTemplate;
@Autowired
private TaskService taskService;
@Autowired
- private TaskPhaseService taskPhaseService;
+ private XhProductModelService xhProductModelService;
@Autowired
private SimulatAssessTaskPhaseModelService simulatAssessTaskPhaseModelService;
@Autowired
@@ -111,6 +109,8 @@
Map<String, JSONObject> templetsMap = new HashMap<>();
Map<String, String> templetsStrMap = new HashMap<>();
+ private JSONObject xmlJSONObj;
+
/**
* 鍒嗛〉鏌ヨ
@@ -135,8 +135,12 @@
return baseDao.getNumById(productId, taskModelId);
}
- public List<SimulatAssess> getList(Long productId, Long taskModelId) {
- return baseDao.getList(productId, taskModelId);
+ public List<SimulatAssess> getList(Long taskModelId) {
+ return baseDao.getList(taskModelId);
+ }
+
+ public SimulatAssess getByTaskId(Long taskModelId) {
+ return baseDao.getByTaskId(taskModelId);
}
public SimulatAssess getParams(Long id, Long taskModelId) {
@@ -206,7 +210,9 @@
x2 = x1 + status.getTimes() * pointNumPerHour + 5;
JSONObject lineJson = new JSONObject(templetsStrMap.get(status.getStatus()));
setlineXy(lineJson, x1, y, x2, y, "");
-
+ JsonUtils2.setJsonValueByPath(lineJson, "data/status".split("/"), status.getStatus());
+ JsonUtils2.setJsonValueByPath(lineJson, "data/startTimes".split("/"), String.format("%.4f", x1));
+ JsonUtils2.setJsonValueByPath(lineJson, "data/endTimes".split("/"), String.format("%.4f", x1 + status.getTimes()));
JsonUtils2.setJsonValueByPath(lineJson, "id".split("/"), UUIDUtil.generateId().toString());
x1 = x2 - 5;
jsonArray.add(lineJson);
@@ -224,7 +230,7 @@
int spaceWitdth = 80;
x1 = -spaceWitdth;
x2 = -11;
- y = -100;
+ y = -130;
String[] tlArr = "O,F,I,S,M".split(",");
for (String s : tlArr) {
JSONObject f = templetsMap.get(s);
@@ -237,19 +243,20 @@
//闃舵妯″瀷鍙婂埢搴�
x1 = 0;
x2 = 0;
- double y1 = -60;
- y = -30;
- double y2 = -10;
- JSONObject modelJson = new JSONObject(templetsStrMap.get("model"));
+ double y1 = -100;
+ y = -70;
+ double y2 = -50;
- setlineXy(modelJson, x1, y1, x1, y2, null);
+ JSONObject modelJson = new JSONObject(templetsStrMap.get("model"));
+ setlineXy(modelJson, 2, y1, 2, y2, null);
jsonArray.add(modelJson);
double totalHours = 0;
for (int i = 0; i < modelDtoList.size(); i++) {
JSONObject modelJson2 = new JSONObject(templetsStrMap.get("model"));
SimulatAssessTaskPhaseModel modelDto = modelDtoList.get(i);
totalHours = totalHours + modelDto.getGkDuration();
- x2 = x2 + modelDto.getGkDuration() * pointNumPerHour;
+ double gkPoint = modelDto.getGkDuration() * pointNumPerHour;
+ x2 = x2 + gkPoint;
if (i < modelDtoList.size() - 1) {
setlineXy(modelJson2, x2, y1, x2, y, null);
} else {
@@ -265,12 +272,16 @@
modelName = modelRbd.getModelName();
modelId = modelRbd.getId().toString();
}
-
+ Map<String, Integer> mapSpace = GetStringSpace.getStringSpaceSize(modelName, null, 18);
JSONObject textJson = new JSONObject(templetsStrMap.get("text"));
JsonUtils2.setJsonValueByPath(textJson, "data/dataId".split("/"), modelId);
JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), modelName);
- JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x1 + 30);
+
+ JsonUtils2.setJsonValueByPath(textJson, "size/width".split("/"), mapSpace.get("width") + 20);
+
+ double x11 = x1 + ((gkPoint - mapSpace.get("width") - 20) / 2);
+ JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x11);
JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y1);
jsonArray.add(textJson);
x1 = x2;
@@ -279,14 +290,28 @@
setlineXy(modelJson3, 0, y, x2, y, null);
jsonArray.add(modelJson3);
- double curPointHour = 10, periodHour = 50;
+ Integer curPointHour = 50, periodHour = 50;
while (curPointHour < totalHours) {
JSONObject modelJson4 = new JSONObject(templetsStrMap.get("model"));
double x = curPointHour * pointNumPerHour;
- setlineXy(modelJson4, x, y, x, y, null);
+ setlineXy(modelJson4, x, y, x, y2, null);
jsonArray.add(modelJson4);
- curPointHour += 10.0;
+
+ Map<String, Integer> mapSpace = GetStringSpace.getStringSpaceSize(curPointHour.toString(), null, 20);
+ JSONObject textJson = new JSONObject(templetsStrMap.get("text"));
+ JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
+ JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), curPointHour.toString());
+
+ JsonUtils2.setJsonValueByPath(textJson, "size/width".split("/"), mapSpace.get("width") + 20);
+
+ double x11 = x - mapSpace.get("width") / 2 - 5;
+ JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x11);
+ JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y2);
+ jsonArray.add(textJson);
+
+ curPointHour += periodHour;
}
+
return jsonObject.toString();
}
@@ -296,6 +321,7 @@
JsonUtils2.setJsonValueByPath(lineJson, "source/y".split("/"), y1);
JsonUtils2.setJsonValueByPath(lineJson, "target/x".split("/"), x2);
JsonUtils2.setJsonValueByPath(lineJson, "target/y".split("/"), y2);
+ JsonUtils2.setJsonValueByPath(lineJson, "id".split("/"), UUIDUtil.generateId().toString());
if (text != null) {
JsonUtils2.setArrJsonValueByPath(lineJson, "labels".split("/"), null, "0", "attrs/text/text", "");
}
@@ -681,16 +707,16 @@
command += " -ip " + redisHost + " -port " + redisPort;
command += " -taskType " + RELIA_SIM_TASK_TYPE_SIMULATION + " -taskId " + simulatAssess.getId().toString();
logger.info("cmd鍛戒护涓猴細" + command);
- if(System.getProperty("os.name").toLowerCase().indexOf("windows") > -1){
+ if (System.getProperty("os.name").toLowerCase().indexOf("windows") > -1) {
process = Runtime.getRuntime().exec(new String[]{"cmd", "/c", command});
- }else if(System.getProperty("os.name").toLowerCase().indexOf("linux") > -1){
+ } else if (System.getProperty("os.name").toLowerCase().indexOf("linux") > -1) {
process = Runtime.getRuntime().exec(new String[]{"/bin/sh", "-c", command});
- }else{
+ } else {
throw new Exception("鏆備笉鏀寔璇ユ搷浣滅郴缁燂紝杩涜鍚姩绠楁硶搴撹绠楋紒");
}
is = process.getInputStream();
// 浠ュ懡浠よ鏂瑰紡璋冪敤绠楁硶搴撴椂锛屾帴鍙ｇ害瀹氳繑鍥炵殑缁撴灉鏄痷tf-8缂栫爜
- br = new BufferedReader(new InputStreamReader(is,"utf-8"));
+ br = new BufferedReader(new InputStreamReader(is, "utf-8"));
String line = br.readLine();
logger.info("绠楁硶搴撹繑鍥炵粨鏋滐細" + line);
// int exitCode = process.waitFor(); // 寮傛鏂瑰紡锛屼笉绛夊緟绠楁硶搴撹绠楀畬姣曪紝鎵�浠ヨ娉ㄩ噴鎺夎琛�
@@ -736,10 +762,21 @@
// 浠跨湡娆℃暟
jsonObject.put("simulate_times", simulatAssess.getSimulatFrequency());
// 閲囨牱鍛ㄦ湡
- jsonObject.put("timeslice", simulatAssess.getSamplPeriod()/60.0); // 鍗曚綅缁熶竴鎹㈢畻涓哄皬鏃�
+ jsonObject.put("timeslice", simulatAssess.getSamplPeriod() / 60.0); // 鍗曚綅缁熶竴鎹㈢畻涓哄皬鏃�
jsonObject.put("result_home", resultHome);
- jsonObject.put("seed", 1000);
+ if (null != fixedRandomSeed && "1".equals(fixedRandomSeed)) {
+ // 鍥哄畾绉嶅瓙
+ jsonObject.put("seed", 1000);
+ } else {
+ // 闅忔満绉嶅瓙
+ jsonObject.put("seed", new Random().nextInt(1000));
+ }
redisTemplate.opsForValue().set(key, jsonObject.toJSONString());
+ }
+
+ public void deleteSimInfoInRedis(Long simId) {
+ redisTemplate.delete(simId.toString() + RELIA_SIM_TASK_TYPE_SIMULATION);
+ redisTemplate.delete(simId.toString() + RELIA_SIM_TASK_TYPE_PROGRESS);
}
private void assembleModelXml(SimulatAssess simulatAssess) {
@@ -795,6 +832,8 @@
} finally {
if (xmlWriter != null) xmlWriter.close();
}
+ // XML瀛樼洏
+ update(simulatAssess);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("缁勮绠楁硶搴撲豢鐪熻绠楃敤妯″瀷XML澶辫触: " + e.getMessage());
@@ -877,7 +916,7 @@
}
private void addRepairModelsTag(List<RepairModel> repairModels,
- Element root) {
+ Element root) {
Element ele = null;
Element repairModelsTag = root.addElement("repair_models");
for (RepairModel repairModel : repairModels) {
@@ -902,7 +941,7 @@
}
private void calcTaskPhaseModelDuration(TaskPhase taskPhase,
- List<TaskPhaseModel> taskPhaseModelAll) {
+ List<TaskPhaseModel> taskPhaseModelAll) {
List<TaskPhaseModel> taskPhaseModels = taskPhaseModelDao.getListByPhaseId(taskPhase.getId());
double totalRate = taskPhaseModels.stream().mapToDouble(TaskPhaseModel::getOperatConditDurationRate).sum();
double sum = 0.0;
@@ -913,8 +952,8 @@
taskPhaseModelAll.add(taskPhaseModel);
}
// 鎶婇浂澶磋ˉ鍒版渶鍚庝竴涓伐鍐垫ā鍨�
- double duration = taskPhaseModels.get(taskPhaseModels.size()-1).getOperatConditDuration();
- taskPhaseModels.get(taskPhaseModels.size()-1).setOperatConditDuration(duration + taskPhase.getPhaseDuration() - sum);
+ double duration = taskPhaseModels.get(taskPhaseModels.size() - 1).getOperatConditDuration();
+ taskPhaseModels.get(taskPhaseModels.size() - 1).setOperatConditDuration(duration + taskPhase.getPhaseDuration() - sum);
}
private List<TaskPhase> calcTaskPhaseDuration(Task task) {
@@ -927,8 +966,8 @@
sum += duration;
}
// 鎶婇浂澶磋ˉ鍒版渶鍚庝竴涓樁娈�
- double duration = taskPhases.get(taskPhases.size()-1).getPhaseDuration();
- taskPhases.get(taskPhases.size()-1).setPhaseDuration(duration + task.getTaskDuration() - sum);
+ double duration = taskPhases.get(taskPhases.size() - 1).getPhaseDuration();
+ taskPhases.get(taskPhases.size() - 1).setPhaseDuration(duration + task.getTaskDuration() - sum);
return taskPhases;
}
@@ -1095,4 +1134,205 @@
return failureModel;
}
+
+ public List<WeakDto> getReliabilityWeakness(Long fzId, Long taskId, Long productId) {
+ String filePath = path + "/" + fzId + "/" + "result.xml";
+ List<WeakDto> list = new ArrayList<>();
+ Map<Long, WeakDto> map = new HashMap<>();
+ String xml = null;
+ InputStream in = null;
+ try {
+ in = new FileInputStream(filePath);
+ xml = IOUtils.toString(in);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ in.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ List<WeakDto> productList = baseDao.getProductList(taskId, productId);
+ for (WeakDto dto : productList) {
+ map.put(dto.getId(), dto);
+ }
+ JSONObject xmlJSONObj = XML.toJSONObject(xml);
+ JSONArray jsonArray = xmlJSONObj.getJSONObject("ResultNodes").getJSONArray("ResultNode");
+ for (int i = 0; i < jsonArray.size(); i++) {
+ WeakDto data = new WeakDto();
+ Long productId1 = null;
+ Object nameValue = jsonArray.getJSONObject(i).get("name");
+ if (nameValue instanceof Long) {
+ productId1 = (Long) nameValue;
+ WeakDto weakDto = map.get(productId1);
+ Double mtbfTime = null;
+
+ Double mtbf = (Double) jsonArray.getJSONObject(i).get("mttf");
+ Double mttr = (Double) jsonArray.getJSONObject(i).get("mttr");
+ Double msr = (Double) jsonArray.getJSONObject(i).get("msr");
+
+ data.setMtbf(mtbf);
+ data.setMttr(mttr);
+ data.setMsr(msr);
+
+ if (weakDto != null) {
+ data.setId(weakDto.getId());
+ data.setSort(weakDto.getSort());
+ data.setPid(weakDto.getPid());
+ data.setName(weakDto.getName());
+ data.setProductType(weakDto.getProductType());
+ data.setTimeRate(weakDto.getTimeRate());
+ mtbfTime = mtbf / weakDto.getTimeRate();
+ }
+
+ data.setMtbfTime(mtbfTime);
+ data.setIsWeak(0);
+
+ list.add(data);
+ }
+ }
+ List<WeakDto> treeList = TreeUtils.build(list);
+ this.getIsweak(treeList.get(0).getChildren());
+ return treeList;
+ }
+
+ private void getIsweak(List<WeakDto> treeList) {
+ WeakDto minDto = null;
+ for (WeakDto dto : treeList) {
+ if (dto.getProductType() == 10)
+ continue;
+ if (minDto == null) {
+ minDto = dto;
+ }
+ if (dto.getMtbfTime() < minDto.getMtbfTime()) {
+ minDto = dto;
+ }
+ }
+ minDto.setIsWeak(1);
+ if (minDto.getChildren().size() > 0) {
+ this.getIsweak(minDto.getChildren());
+ }
+ }
+
+ public SchemeComparDto SchemeCompar(String[] taskList, Long showProductId) {
+ SchemeComparDto dto = new SchemeComparDto();
+ List<SimulaDataDto> dataDtoList = new ArrayList<>();
+ List<SchemeComparCurve> curveList = new ArrayList<>();
+ List<Double> xData = new ArrayList<>();
+ SimulatAssess simulatAssess;
+ SimulaDataDto data;
+
+ Task task;
+ for (String taskId : taskList) {
+ Long taskModelId = Long.parseLong(taskId);
+ task = taskService.get(taskModelId);
+ simulatAssess = this.getByTaskId(taskModelId);
+ SimulaDataDto resultData;
+ if (showProductId!=null){
+ simulatAssess.setShowProductId(showProductId);
+ resultData =this.getResultData(simulatAssess);
+ }else{
+ resultData = this.getResultXML(simulatAssess);
+ }
+
+ data = resultData;
+ data.setName(task.getTaskName());
+ dataDtoList.add(data);
+ xData = resultData.getCurveParam().getXData();
+
+ SchemeComparCurve curve = new SchemeComparCurve();
+ curve.setName(task.getTaskName());
+ curve.setSmooth(true);
+ curve.setType("line");
+ curve.setData(resultData.getCurveParam().getYData());
+ curveList.add(curve);
+ }
+ dto.setXDataList(xData);
+ dto.setDataList(dataDtoList);
+ dto.setCurveList(curveList);
+ return dto;
+ }
+
+ public SimulaDataDto getResultXML(SimulatAssess simulatAssess) {
+ if (simulatAssess.getDataType() != null && simulatAssess.getDataType().equals("fz")) {
+ Integer num = this.getNumById(simulatAssess.getProductId(), simulatAssess.getTaskModelId());
+ simulatAssess.setName("浠跨湡璁板綍" + (num + 1));
+ this.insert(simulatAssess);
+ }
+ String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
+ String xml = null;
+ InputStream in = null;
+ try {
+ in = new FileInputStream(filePath);
+ xml = IOUtils.toString(in);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ in.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ xmlJSONObj = XML.toJSONObject(xml);
+ simulatAssess.setShowProductId(simulatAssess.getProductId());
+ SimulaDataDto data = this.getResultData(simulatAssess);
+ return data;
+ }
+
+ public SimulaDataDto getResultData(SimulatAssess simulatAssess) {
+ SimulaDataDto data = new SimulaDataDto();
+ CurveParam param = new CurveParam();
+ Double samplPeriod = Double.valueOf(simulatAssess.getSamplPeriod());
+ samplPeriod = samplPeriod / 60;
+ JSONArray jsonArray = xmlJSONObj.getJSONObject("ResultNodes").getJSONArray("ResultNode");
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Long productId = null;
+ Object nameValue = jsonArray.getJSONObject(i).get("name");
+ if (nameValue instanceof Long) {
+ productId = (Long) nameValue;
+ if (productId.equals(simulatAssess.getShowProductId())) {
+ Object object = jsonArray.getJSONObject(i).get("phase");
+ List<Double> doubleArray = new ArrayList<>();
+ List<Double> xList = new ArrayList<>();
+ String availability = null;
+ if (object instanceof JSONArray) {
+ JSONArray jsonArray2 = jsonArray.getJSONObject(i).getJSONArray("phase");
+ for (int j = 0; j < jsonArray2.size(); j++) {
+ if (availability != null) {
+ availability = availability + " " + jsonArray2.getJSONObject(j).get("availability");
+ } else {
+ availability = (String) jsonArray2.getJSONObject(j).get("availability");
+ }
+ }
+ } else {
+ JSONObject jsonObject2 = jsonArray.getJSONObject(i).getJSONObject("phase");
+ availability = (String) jsonObject2.get("availability");
+ }
+
+ String[] arr = availability.split(" ");
+ // 閬嶅巻瀛愬瓧绗︿覆鏁扮粍锛屽皢姣忎釜鍏冪礌杞崲涓篸ouble骞跺瓨鍌ㄥ埌double鏁扮粍涓�
+ Double j = 0.0;
+ for (int a = 0; a < arr.length; a++) {
+ j = samplPeriod + j;
+ doubleArray.add(Double.parseDouble(arr[a]));
+ xList.add(j);
+ }
+
+ param.setXData(xList);
+ param.setYData(doubleArray);
+ Double mtbf = (Double) jsonArray.getJSONObject(i).get("mttf");
+ Double mttr = (Double) jsonArray.getJSONObject(i).get("mttr");
+ Double msr = (Double) jsonArray.getJSONObject(i).get("msr");
+ data.setMtbf(mtbf);
+ data.setMttr(mttr);
+ data.setMsr(msr);
+ }
+ data.setCurveParam(param);
+ }
+ }
+ return data;
+ }
}
--
Gitblit v1.9.1