From a87bd0dee3b1312531c28c82a01ea47f5380fc87 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 30 九月 2024 16:00:45 +0800
Subject: [PATCH] 解决调用matlab程序出错
---
src/main/java/com/se/simu/config/PropertiesConfig.java | 6 +++---
libs/simu.jar | 0
src/main/java/com/se/simu/service/UwService.java | 30 ++++++++++--------------------
3 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/libs/simu.jar b/libs/simu.jar
index 0703f24..dc785c9 100644
--- a/libs/simu.jar
+++ b/libs/simu.jar
Binary files differ
diff --git a/src/main/java/com/se/simu/config/PropertiesConfig.java b/src/main/java/com/se/simu/config/PropertiesConfig.java
index e774602..8e97242 100644
--- a/src/main/java/com/se/simu/config/PropertiesConfig.java
+++ b/src/main/java/com/se/simu/config/PropertiesConfig.java
@@ -56,7 +56,7 @@
private String rainStation;
- private Integer rainPeriod;
+ private Double rainPeriod;
private String flowUnits;
@@ -238,11 +238,11 @@
this.rainStation = rainStation;
}
- public Integer getRainPeriod() {
+ public Double getRainPeriod() {
return rainPeriod;
}
- public void setRainPeriod(Integer rainPeriod) {
+ public void setRainPeriod(Double rainPeriod) {
this.rainPeriod = rainPeriod;
}
}
diff --git a/src/main/java/com/se/simu/service/UwService.java b/src/main/java/com/se/simu/service/UwService.java
index e2226d3..0385dc6 100644
--- a/src/main/java/com/se/simu/service/UwService.java
+++ b/src/main/java/com/se/simu/service/UwService.java
@@ -39,28 +39,18 @@
String filePath = config.getInPath() + File.separator + data.getInPath() + File.separator + config.getRaingage();
String startTime = StringHelper.YMDHMS_FORMAT.format(data.getStartTime());
- MWCharArray file = new MWCharArray(filePath);
- MWCharArray station = new MWCharArray(config.getRainStation());
- MWCharArray time = new MWCharArray(startTime);
+ //MWCharArray file = new MWCharArray(filePath);
+ //MWCharArray station = new MWCharArray(config.getRainStation());
+ //MWCharArray time = new MWCharArray(startTime);
- try {
- Rainfall rainfall = new Rainfall();
- //rainfall('D:\simu\in\RainGage.dat','Tongzhou','2024-09-29 00:00:00',60,0.5,10)
- //Object[] rs = rainfall.rainfall(0, file, station, time, data.getDuration(), 0.5, config.getRainPeriod());
- List args = new ArrayList<Object>();
- args.add(filePath);
- args.add(config.getRainStation());
- args.add(startTime);
- args.add(data.getDuration());
- args.add(0.5);
- args.add(config.getRainPeriod());
+ Rainfall rainfall = new Rainfall();
+ //rainfall('D:\simu\in\RainGage.dat','Tongzhou','2024-09-29 00:00:00',60,0.5,10)
+ Object[] rs = rainfall.rainfall(filePath, config.getRainStation(), startTime,
+ Double.valueOf(data.getDuration()), 0.5, config.getRainPeriod());
- rainfall.rainfall(new ArrayList(), args);
- } finally {
- file.dispose();
- station.dispose();
- time.dispose();
- }
+ // file.dispose();
+ //station.dispose();
+ //time.dispose();
}
public void createConfig(DataPo data) throws IOException {
--
Gitblit v1.9.3