Explorar o código

优化目标 接口修改

huangxingxing hai 6 meses
pai
achega
776c773b41

+ 4 - 0
src/main/java/com/miniframe/modo/temp/TemplateGenerator.java

@@ -151,6 +151,10 @@ public class TemplateGenerator {
         if(xfoil==null&& adflow==null){
             return null;
         }
+        HeaderVo header =new HeaderVo();
+        header.setName(pid);
+        header.setTimestamp(new Date());
+        vo.setHeader(header);
         return vo;
     }
     public static CpacsVo getCpacsVo(String pid) {

+ 9 - 0
src/main/java/com/miniframe/modo/temp/problem/WorkflowVo.java

@@ -1,4 +1,13 @@
 package com.miniframe.modo.temp.problem;
 
 public class WorkflowVo {
+    private HeaderVo header;
+
+    public HeaderVo getHeader() {
+        return header;
+    }
+
+    public void setHeader(HeaderVo header) {
+        this.header = header;
+    }
 }

+ 10 - 10
src/main/resources/templates/problem.ftl

@@ -18,6 +18,16 @@
       </designVariable>
       </#list>
     </designVariables>
+     <constraints>
+          <#list vo.constraints as b>
+          <constraint uID="${b.uID}">
+                <name>${b.name}</name>
+                <value>${b.value}</value>
+                <lower>${b.lower}</lower>
+                <upper>${b.upper}</upper>
+          </constraint>
+          </#list>
+        </constraints>
     <objectives>
       <#list vo.objectives as b>
       <objective uID="${b.uID}">
@@ -28,16 +38,6 @@
       </objective>
       </#list>
     </objectives>
-    <constraints>
-      <#list vo.constraints as b>
-      <constraint uID="${b.uID}">
-            <name>${b.name}</name>
-            <value>${b.value}</value>
-            <lower>${b.lower}</lower>
-            <upper>${b.upper}</upper>
-      </constraint>
-      </#list>
-    </constraints>
   </problem>
   <optimizers>
     <optimizer uID="optimizer3">

+ 2 - 2
src/main/resources/templates/workflow.ftl

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <opcs>
     <header>
-        <name>xfoil0313a</name>
+        <name>${vo.header.name}</name>
         <creator>SurroMDAO</creator>
-        <timestamp>2025-03-13T19:21:41</timestamp>
+        <timestamp>${vo.header.timestamp}</timestamp>
         <version>0.1</version>
         <opcsVersion>1.0</opcsVersion>
     </header>