|
|
@@ -294,9 +294,9 @@
|
|
|
<xsl:when test="number($bit_max) < number(15) "> <!-- do przyjecia przez procesor kombinacji-->
|
|
|
<xsl:message>#296 max_combinate_groups_elements_for_group number($bit_max=<xsl:value-of select="$bit_max"/>) < number(15)</xsl:message>
|
|
|
<xsl:choose>
|
|
|
- <xsl:when test="number($elements_cnt) > 40">
|
|
|
- <xsl:message>#297 narzucam fixed liczbe 40 z uwagi na $bit_max=<xsl:value-of select="$bit_max"/> < 15 ilosc max = $elements_cnt=<xsl:value-of select="$elements_cnt"/>; </xsl:message>
|
|
|
- <xsl:value-of select="40"/>
|
|
|
+ <xsl:when test="number($elements_cnt) > 20">
|
|
|
+ <xsl:message>#297 narzucam fixed liczbe 20 z uwagi na $bit_max=<xsl:value-of select="$bit_max"/> < 15 ilosc max = $elements_cnt=<xsl:value-of select="$elements_cnt"/>; </xsl:message>
|
|
|
+ <xsl:value-of select="20"/>
|
|
|
</xsl:when>
|
|
|
<xsl:otherwise>
|
|
|
<xsl:message>#302 max_combinate_groups_elements_for_group setting to current count - number($elements_cnt=<xsl:value-of select="$elements_cnt"/>); </xsl:message>
|
|
|
@@ -632,7 +632,7 @@
|
|
|
<xsl:value-of select="number($variant)"/>
|
|
|
</xsl:when>
|
|
|
<xsl:when test="number($max_bit) > 0">
|
|
|
- <xsl:if test="$variant mod 64 = 0 ">
|
|
|
+ <xsl:if test="$variant mod 2048 = 0 ">
|
|
|
<xsl:message>#80 try to find next $bit=<xsl:value-of select="$bit"/>; $max_possible_bit=<xsl:value-of select="$max_possible_bit"/>; $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:if>
|
|
|
<!--<xsl:variable name="variant_found" select="bp:next_bit_max(number($variant),$max_bit,$max_possible_bit,0)"/>-->
|
|
|
@@ -661,7 +661,7 @@
|
|
|
</xsl:choose>
|
|
|
</xsl:variable>
|
|
|
<xsl:if test=" string-length($bit) = 0"><xsl:message>#650 zerowy $bit ! nie moze byc tak!</xsl:message></xsl:if>
|
|
|
- <xsl:if test="$variant mod 64 = 0 ">
|
|
|
+ <xsl:if test="$variant mod 2048 = 0 ">
|
|
|
<xsl:message>...#625 $variant curr found <xsl:value-of select="$variant"/>; $max_bit=<xsl:value-of select="$max_bit"/>; $bit=<xsl:value-of select="$bit"/>, $elements_cnt=<xsl:value-of select="$elements_cnt"/>;</xsl:message>
|
|
|
</xsl:if>
|
|
|
<xsl:variable name="cand_to_calc">
|