|
@@ -187,10 +187,11 @@
|
|
|
<xsl:for-each-group select="$EconomicDistanceCut2/EconomicDistanceCut2/distance2" group-by="@PosCut3GrId "> <!-- stare : round( @distance div ( $PE_Price div $Cable_Price + 50 ))-->
|
|
<xsl:for-each-group select="$EconomicDistanceCut2/EconomicDistanceCut2/distance2" group-by="@PosCut3GrId "> <!-- stare : round( @distance div ( $PE_Price div $Cable_Price + 50 ))-->
|
|
|
<PointMatrixGroupPos>
|
|
<PointMatrixGroupPos>
|
|
|
<xsl:variable name="elements_cnt_Pos" select="count(current-group()[@point_count > 0])"/>
|
|
<xsl:variable name="elements_cnt_Pos" select="count(current-group()[@point_count > 0])"/>
|
|
|
|
|
+ <xsl:variable name="countGr" select="count(current-group())"/>
|
|
|
<xsl:variable name="bit_max_Pos" select="round(sum( current-group()/@disttopkt ) div ( $PE_Price div 20 ) )"/>
|
|
<xsl:variable name="bit_max_Pos" select="round(sum( current-group()/@disttopkt ) div ( $PE_Price div 20 ) )"/>
|
|
|
<xsl:message>Nowa grupa Ways:<xsl:value-of select="@PosCut3GrId"/>; distanceGr=<xsl:value-of select="@PosCut3GrId"/>;elements_cnt_Pos=<xsl:value-of select="$elements_cnt_Pos"/>
|
|
<xsl:message>Nowa grupa Ways:<xsl:value-of select="@PosCut3GrId"/>; distanceGr=<xsl:value-of select="@PosCut3GrId"/>;elements_cnt_Pos=<xsl:value-of select="$elements_cnt_Pos"/>
|
|
|
@bit_max_Pos=<xsl:value-of select="$bit_max_Pos"/>; @id_path=<xsl:value-of select="@id_path"/>;
|
|
@bit_max_Pos=<xsl:value-of select="$bit_max_Pos"/>; @id_path=<xsl:value-of select="@id_path"/>;
|
|
|
- point_count_Pos=<xsl:value-of select="sum(current-group()/@point_count)"/>; len_sum=<xsl:value-of select="sum(current-group()/@len)"/> ;
|
|
|
|
|
|
|
+ countGr=<xsl:value-of select="$countGr"/>; point_count_Pos=<xsl:value-of select="sum(current-group()/@point_count)"/>; len_sum=<xsl:value-of select="sum(current-group()/@len)"/> ;
|
|
|
distanceBeg/distanceEnd= <xsl:value-of select="min(current-group()/number(@distance))"/>/<xsl:value-of select="max(current-group()/number(@distance))"/>
|
|
distanceBeg/distanceEnd= <xsl:value-of select="min(current-group()/number(@distance))"/>/<xsl:value-of select="max(current-group()/number(@distance))"/>
|
|
|
</xsl:message>
|
|
</xsl:message>
|
|
|
<xsl:attribute name="distanceGr" select="@PosCut3GrId "/> <!-- bylo current-grouping-key() -->
|
|
<xsl:attribute name="distanceGr" select="@PosCut3GrId "/> <!-- bylo current-grouping-key() -->
|
|
@@ -202,6 +203,7 @@
|
|
|
<xsl:attribute name="len_sum" select="sum(current-group()/@len)"/>
|
|
<xsl:attribute name="len_sum" select="sum(current-group()/@len)"/>
|
|
|
<xsl:attribute name="distanceBeg" select="min(current-group()/number(@distance))"/>
|
|
<xsl:attribute name="distanceBeg" select="min(current-group()/number(@distance))"/>
|
|
|
<xsl:attribute name="distanceEnd" select="max(current-group()/number(@distance))"/>
|
|
<xsl:attribute name="distanceEnd" select="max(current-group()/number(@distance))"/>
|
|
|
|
|
+ <xsl:attribute name="countGr" select="$countGr"/>
|
|
|
<!--<xsl:attribute name="GroupPos" select="position()"/>-->
|
|
<!--<xsl:attribute name="GroupPos" select="position()"/>-->
|
|
|
<xsl:for-each select="current-group()">
|
|
<xsl:for-each select="current-group()">
|
|
|
<distance2>
|
|
<distance2>
|
|
@@ -407,7 +409,7 @@
|
|
|
<xsl:choose>
|
|
<xsl:choose>
|
|
|
<xsl:when test="$bit = $max_bit">
|
|
<xsl:when test="$bit = $max_bit">
|
|
|
<koniec_wariantow>
|
|
<koniec_wariantow>
|
|
|
- <xsl:message>#410 OK - przeliczony wariant bit=<xsl:value-of select="$best"/> ( nr <xsl:value-of select="$variant"/>;) </xsl:message>
|
|
|
|
|
|
|
+ <xsl:message>#410 OK - przeliczony wariant bit=<xsl:value-of select="$best_variant"/> ( nr <xsl:value-of select="$variant"/>;) </xsl:message>
|
|
|
<xsl:attribute name="best_variant" select="$best_variant"/>
|
|
<xsl:attribute name="best_variant" select="$best_variant"/>
|
|
|
<xsl:for-each select="$candidates/bp:Path_Point">
|
|
<xsl:for-each select="$candidates/bp:Path_Point">
|
|
|
<xsl:sort select="@distance"/>
|
|
<xsl:sort select="@distance"/>
|
