huangxingxing 7 月之前
父节点
当前提交
84550a7c7a

+ 1 - 1
src/main/java/com/miniframe/tools/docker/DockerExe.java

@@ -115,7 +115,7 @@ public class DockerExe {
         Mount outMount = new Mount()
         Mount outMount = new Mount()
                 .withType(MountType.BIND)
                 .withType(MountType.BIND)
                 .withSource("/cephfs/mdo/"+pid +"/out/")
                 .withSource("/cephfs/mdo/"+pid +"/out/")
-                .withTarget("/workspace/")
+                .withTarget("/workspace/outdata/")
                 .withReadOnly(false);
                 .withReadOnly(false);
 
 
         Mount runMount = new Mount()
         Mount runMount = new Mount()

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

@@ -42,7 +42,7 @@
   <optimizers>
   <optimizers>
     <optimizer>
     <optimizer>
       <#if vo.evolution??>
       <#if vo.evolution??>
-      <name>${vo.evolution.algorithm}</name>
+      <name>${vo.evolution.algorithm?lower_case}</name>
       <configFile/>
       <configFile/>
       <configuration>
       <configuration>
         <maxgen>${vo.evolution.popsize}</maxgen>
         <maxgen>${vo.evolution.popsize}</maxgen>
@@ -55,7 +55,7 @@
       <#else>
       <#else>
       </#if>
       </#if>
       <#if vo.surro??>
       <#if vo.surro??>
-        <name>${vo.surro.algorithm}</name>
+        <name>${vo.surro.algorithm?lower_case}</name>
         <configuration>
         <configuration>
             <optimization>
             <optimization>
                 <iout>${vo.surro.iout}</iout>
                 <iout>${vo.surro.iout}</iout>
@@ -95,7 +95,7 @@
       <#else>
       <#else>
       </#if>
       </#if>
       <#if vo.grad??>
       <#if vo.grad??>
-        <name>${vo.grad.algorithm}</name>
+        <name>${vo.grad.algorithm?lower_case}</name>
         <configuration>
         <configuration>
             <major_iterations_limit>${vo.grad.majorIterationsLimit}</major_iterations_limit>                     <!--最大外迭代步数 -->
             <major_iterations_limit>${vo.grad.majorIterationsLimit}</major_iterations_limit>                     <!--最大外迭代步数 -->
             <major_print_level>${vo.grad.majorPrintLevel}</major_print_level> 		    				     <!--输出精度等级-->
             <major_print_level>${vo.grad.majorPrintLevel}</major_print_level> 		    				     <!--输出精度等级-->
@@ -122,7 +122,7 @@
         <workflowPath/>
         <workflowPath/>
        </#if>
        </#if>
        <#if b.pythonPath??>
        <#if b.pythonPath??>
-        <pythonPath>${b.pythonPath}</pythonPath>
+        <pythonPath name="Forrester">${b.pythonPath}</pythonPath>
        <#else>
        <#else>
         <pythonPath/>
         <pythonPath/>
        </#if>
        </#if>

+ 1 - 1
src/main/resources/templates/run.ftl

@@ -1,4 +1,4 @@
 from surromdao.utils import *
 from surromdao.utils import *
-prob = Problem.load_problem_from_xml('${problemPath}}')
+prob = Problem.load_problem_from_xml('${problemPath}')
 opt = OptTask(prob, "tz")
 opt = OptTask(prob, "tz")
 opt.run()
 opt.run()