|
|
@@ -605,26 +605,26 @@
|
|
|
<!-- znajduje kolejny korzystny wariant bit -->
|
|
|
<xsl:variable name="variant">
|
|
|
<xsl:choose>
|
|
|
- <xsl:when test="number($max_bit) >= number($elements_cnt)">
|
|
|
- <xsl:message>#576 $max_bit <xsl:value-of select="$max_bit"/> >$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) >= number($elements_cnt)">
|
|
|
+ <xsl:message>#576 $max_bit <xsl:value-of select="$max_possible_bit"/> >$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) > 0">
|
|
|
+ <xsl:when test="number($max_possible_bit) > 0">
|
|
|
|
|
|
- <xsl:message>#80 try to find next $max_bit <xsl:value-of select="$max_bit"/> >$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"/> >$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">
|