a.binder 9 лет назад
Родитель
Сommit
e91cf54691

+ 2 - 2
SE/dev/php-cli/PE_wariant_bit_table.xsl

@@ -88,7 +88,7 @@
         </xsl:variable>
         <xsl:variable name="cur_bit_len" select=" string-length($digits)"/>
         <xsl:choose>
-            <xsl:when test="number($loop) &gt; 1024">
+            <xsl:when test="number($loop) &gt; 60000">
                 <!--<xsl:message>#91 loop:<xsl:value-of select="$loop"/>; hit returning $variant=<xsl:value-of select="$variant"/>; $curr_bit=<xsl:value-of select="$curr_bit"/>;</xsl:message>-->
                 <xsl:value-of select="$variant"/>
             </xsl:when>
@@ -102,7 +102,7 @@
             <xsl:when test="number($cur_bit_len) &gt;  number($bit_limit)">
                 <!--<xsl:variable name="next_bit" select="bp:decimalToBit($variant+1)"/>-->
                 <!--<xsl:message>#104 next <xsl:value-of select="$variant"/></xsl:message>-->
-                <xsl:value-of select="bp:next_bit_max($variant + 1,$bit_limit,$no_more_variants,$loop+1)"/>
+                <xsl:value-of select="bp:next_bit_max($variant ,$bit_limit,$no_more_variants,$loop+1)"/>
             </xsl:when>
         </xsl:choose>
     </xsl:function>

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

@@ -605,26 +605,26 @@
         <!-- znajduje kolejny korzystny wariant bit -->
         <xsl:variable name="variant">
             <xsl:choose>
-                <xsl:when test="number($max_bit) &gt;= number($elements_cnt)">
-                    <xsl:message>#576 $max_bit <xsl:value-of select="$max_bit"/> &gt;$elements_cnt=<xsl:value-of select="$elements_cnt"/>; in $variant=<xsl:value-of select="$variant"/>;</xsl:message>
-                    <xsl:value-of select="$variant"/>
+                <xsl:when test="number($max_possible_bit) &gt;= number($elements_cnt)">
+                    <xsl:message>#576 $max_bit <xsl:value-of select="$max_possible_bit"/> &gt;$elements_cnt=<xsl:value-of select="$elements_cnt"/>; in $variant=<xsl:value-of select="$variant"/>;</xsl:message>
+                    <xsl:value-of select="number($variant)"/>
                 </xsl:when>
-                <xsl:when test="number($max_bit) &gt; 0">
+                <xsl:when test="number($max_possible_bit) &gt; 0">
                     
-                    <xsl:message>#80  try to find next $max_bit <xsl:value-of select="$max_bit"/> &gt;$elements_cnt=<xsl:value-of select="$elements_cnt"/>; in $variant=<xsl:value-of select="$variant"/>;</xsl:message>
-                    <xsl:variable name="variant_found" select="bp:next_bit_max($variant,$max_bit,$elements_cnt,0)"/>
+                    <xsl:message>#80  try to find next $max_bit <xsl:value-of select="$max_possible_bit"/> &gt;$elements_cnt=<xsl:value-of select="$elements_cnt"/>; in $variant=<xsl:value-of select="$variant"/>;</xsl:message>
+                    <xsl:variable name="variant_found" select="bp:next_bit_max(number($variant),$max_possible_bit,$elements_cnt,0)"/>
                     <xsl:value-of select="$variant_found"/>
                     
                 </xsl:when>
                 <xsl:otherwise>
-                    <xsl:value-of select="$variant"/>
+                    <xsl:value-of select="number($variant)"/>
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:variable>
       
         <xsl:variable name="bit" select=" string-join(bp:decimalToBitFill($variant,$elements_cnt),'')"/>
         <xsl:if test="$variant mod 1000 = 0 ">
-            <xsl:message>...  $variant curr found <xsl:value-of select="$variant"/>; $bit=<xsl:value-of select="$bit"/></xsl:message>
+            <xsl:message>...  $variant curr found <xsl:value-of select="$variant"/>; $bit=<xsl:value-of select="$bit"/>, $elements_cnt=<xsl:value-of select="$elements_cnt"/>;</xsl:message>
         </xsl:if>
         <xsl:variable name="cand_to_calc">
             <xsl:for-each select="$candidates/bp:Path_Point">