Forráskód Böngészése

poprawa loop , do pozbierania drogi wzajemne

a.binder 9 éve
szülő
commit
c501be3e28

+ 3 - 1
SE/dev/php-cli/build_edge_paths_with_PE_controll_loop.xsl

@@ -51,7 +51,7 @@
         <delete file="{$edge_paths_with_PE_controll_paths_temp}/{$edge_paths_with_PE_controll.xsl}.{@id}.xml"/>
         <delete file="{$edge_paths_with_PE_controll_paths_temp}/{$edge_paths_with_PE_controll.xsl}.{@id}.xml"/>
         <xslt basedir="./" style="{$edge_paths_with_PE_controll.xsl}" 
         <xslt basedir="./" style="{$edge_paths_with_PE_controll.xsl}" 
             in="{$edge_joins_filled_paths}/{$edge_joins_filled_paths}.{@id}.xml"  destdir="./" 
             in="{$edge_joins_filled_paths}/{$edge_joins_filled_paths}.{@id}.xml"  destdir="./" 
-            out="{$edge_paths_with_PE_controll_paths_temp}/{$edge_paths_with_PE_controll.xsl}.{@id}.xml" >
+            out="{$edge_paths_with_PE_controll.xsl}.{@id}.xml" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
                 <!--<attribute name="http://saxon.sf.net/feature/initialMode" value="DITA_PARSE_templ"/>-->
                 <!--<attribute name="http://saxon.sf.net/feature/initialMode" value="DITA_PARSE_templ"/>-->
@@ -65,6 +65,8 @@
             <param name="max_combinate_groups_elements" expression="{$max_combinate_groups_elements}"/> <!-- po ile wezlow mamy grupowac do wyliczania kombinacji kosztow -->
             <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 -->
             <!--<xsl:param name="logic" select="'sorted'"/>--> <!-- tutaj robi grupy ale analizyje w grupie tylko wazniejsze/bardziej oblozone wezly -->
+            <move file="{$edge_paths_with_PE_controll.xsl}.{@id}.xml" tofile="{$edge_paths_with_PE_controll_paths_temp}/{$edge_paths_with_PE_controll.xsl}.{@id}.xml"/>
+            
         </xslt>
         </xslt>
     </xsl:template>
     </xsl:template>
     
     

+ 1 - 1
SE/dev/php-cli/edge_paths_with_PE_controll.xsl

@@ -320,7 +320,7 @@
                     -->
                     -->
                         <xsl:variable name="cache_file_name" select="concat($edge_paths_with_PE_controll_temp,'/odpalam_liczenie_or_nie_',$ID_Way,'_',$distanceGr,'.xml')"/>
                         <xsl:variable name="cache_file_name" select="concat($edge_paths_with_PE_controll_temp,'/odpalam_liczenie_or_nie_',$ID_Way,'_',$distanceGr,'.xml')"/>
                         <xsl:variable name="PrevdistanceGr" select="number($distanceGr) - 1"/>
                         <xsl:variable name="PrevdistanceGr" select="number($distanceGr) - 1"/>
-                        <xsl:variable name="cache_file_name_previous" select="concat( $edge_paths_with_PE_controll_temp.alias,'/odpalam_liczenie_or_nie_',$ID_Way,'_',$PrevdistanceGr,'.xml')"/>
+                        <xsl:variable name="cache_file_name_previous" select="concat(  $edge_paths_with_PE_controll_temp.alias,'/odpalam_liczenie_or_nie_',$ID_Way,'_',$PrevdistanceGr,'.xml')"/>
                         <xsl:variable name="poprzednie_odpalam_liczenie_or_nie">
                         <xsl:variable name="poprzednie_odpalam_liczenie_or_nie">
                             <xsl:if test="$PrevdistanceGr &gt; 0 ">
                             <xsl:if test="$PrevdistanceGr &gt; 0 ">
                                 <xsl:copy-of select="doc($cache_file_name_previous)"/>
                                 <xsl:copy-of select="doc($cache_file_name_previous)"/>