|
|
@@ -455,7 +455,7 @@
|
|
|
<xsl:choose>
|
|
|
<xsl:when test="$candidates/bp:Path_Point/PathsCrossed[@NeighJoin_way_up_ID_Join or @NeighJoin_way_dn_ID_Join]">
|
|
|
<xsl:message>#534 there are PathsCrossed - allow to decrease -1</xsl:message>
|
|
|
- <xsl:value-of select="0"/>
|
|
|
+ <xsl:value-of select="1"/>
|
|
|
</xsl:when>
|
|
|
<xsl:otherwise><xsl:value-of select="1"/></xsl:otherwise>
|
|
|
</xsl:choose>
|
|
|
@@ -562,7 +562,7 @@
|
|
|
<!--<xsl:attribute name="bit" select="$bit"/>-->
|
|
|
<xsl:attribute name="bin_pos" select="substring($bit, position(),1)"/>
|
|
|
<xsl:copy-of select="@*"/>
|
|
|
- <!--<xsl:copy-of select="bp:Path_Point"/>-->
|
|
|
+ <xsl:copy-of select="bp:Path_Point"/>
|
|
|
<xsl:copy-of select="PathsCrossed"/>
|
|
|
</bp:Path_Point>
|
|
|
</xsl:for-each>
|
|
|
@@ -764,6 +764,9 @@
|
|
|
<xsl:attribute name="debug" select="'ignore by last DistGroup @poprzednia_grupa'"/>
|
|
|
</cost>
|
|
|
</xsl:when>
|
|
|
+ <xsl:when test="number(string-length(@bin_pos))=0">
|
|
|
+ <xsl:message>#768 debug @bin_pos=<xsl:value-of select="@bin_pos"/>; </xsl:message>
|
|
|
+ </xsl:when>
|
|
|
<xsl:when test="@bin_pos=0"><!-- szukamy gdzie ma najblizej i za ile -->
|
|
|
<xsl:variable name="way_up_id" select="max($candidates_merged_with_poprzednie/bp:Path_Point[@bin_pos=1 and number(@distance) < current()/number(@distance )]/number(@id_path))"/>
|
|
|
<xsl:variable name="ID_Join_up" select="$candidates_merged_with_poprzednie/bp:Path_Point[@id_path =$way_up_id ]/@ID_Join"/>
|
