Browse Source

blad apostr

a.binder 9 năm trước cách đây
mục cha
commit
b5c63e4e5f
1 tập tin đã thay đổi với 11 bổ sung3 xóa
  1. 11 3
      SE/dev/php-cli/build.xml

+ 11 - 3
SE/dev/php-cli/build.xml

@@ -69,7 +69,11 @@
     
     <target description="shows options for project" name="help">
         <echo> Generator for telecomunications objects - concentrations points based on constraints of prices of cable and cost of cocentrators (PE).
-            This parameters are set by variables:   Set variables ( ex. sh# ant -DPE_Price=2500 -DCable_Price=25002 -Dlogic=grouped PE_and_Cables ) 
+            This parameters are set by variables:   Set variables ( ex. sh# ant -DPE_Price=2500 -DCable_Price=2500 -Dlogic=grouped PE_and_Cables -Dmax_combinate_groups_elements=12 ) 
+            
+            or
+            # ant -DPE_Price=2500 -DCable_Price=3000 -Dlogic=grouped -Dmax_combinate_groups_elements=18 edge_paths_with_PE_controll.xml  edge_paths_with_PE.xml biale_plamy_put_PE_to_mysql_php
+            
             
             VARIABLES
                 PE_Price - price per concentration point - default =  ${PE_Price} 
@@ -353,7 +357,10 @@
     </target>
     <!-- postawienie PE po trasach nowe-->
     <target name="edge_paths_with_PE_controll.xml">
-        <echo message="Wyznaczenie PE na podstawie tras ${edge_paths_with_PE.xml} nowym ${edge_paths_with_PE_controll.xsl} "/>
+        <echo message="Wyznaczenie PE na podstawie tras ${edge_paths_with_PE.xml} nowym ${edge_paths_with_PE_controll.xsl}
+            z parametrami PE_Price=${PE_Price} , Cable_Price=${Cable_Price}, max_combinate_groups_elements=${max_combinate_groups_elements}, 
+            logic=${logic}. 
+            "/>
         
         <delete file="${edge_paths_with_PE_controll.xml}"/>
         
@@ -363,6 +370,7 @@
          <symlink link="${edge_paths_with_PE_controll_temp.alias}" resource="${edge_paths_with_PE_controll_temp}"/>
         
         <xslt basedir="./" style="${edge_paths_with_PE_controll.xsl}" in="${edge_joins_filled_paths.xml}"  destdir="./" out="${edge_paths_with_PE_controll.xml}" >
+            
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
                 <!--<attribute name="http://saxon.sf.net/feature/initialMode" value="DITA_PARSE_templ"/>-->
@@ -377,7 +385,7 @@
             <param name="PE_Price" expression="${PE_Price}"/>
             <param name="Cable_Price" expression="${Cable_Price}"/>
             <param name="max_combinate_groups_elements" expression="${max_combinate_groups_elements}"/> <!-- po ile wezlow mamy grupowac do wyliczania kombinacji kosztow -->
-            <param name="logic" expression="${logic}'"/>
+            <param name="logic" expression="${logic}"/>
             <!--<xsl:param name="logic" select="'sorted'"/>--> <!-- tutaj robi grupy ale analizyje w grupie tylko wazniejsze/bardziej oblozone wezly -->