a.binder vor 9 Jahren
Ursprung
Commit
91d406537e
1 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
  1. 3 3
      SE/dev/php-cli/edge_paths_with_PE_controll.xsl

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

@@ -13,7 +13,7 @@
     <xsl:strip-space elements="*"/>
     <xsl:strip-space elements="*"/>
     
     
     <xsl:param name="PE_Price" select="1500"/>
     <xsl:param name="PE_Price" select="1500"/>
-    <xsl:param name="Cable_Price" select="40"/>
+    <xsl:param name="Cable_Price" select="10"/>
     
     
     <xsl:param name="edge_paths_with_PE.xml"/>
     <xsl:param name="edge_paths_with_PE.xml"/>
     
     
@@ -164,12 +164,12 @@
             <xsl:copy-of select="$EconomicDistanceCut2"/>
             <xsl:copy-of select="$EconomicDistanceCut2"/>
             
             
             <xsl:variable name="elements_cnt" select="count($EconomicDistanceCut2/EconomicDistanceCut2/distance2[@point_count &gt; 0])"/><!-- liczba wezlow potencjalnych licbza PE-->
             <xsl:variable name="elements_cnt" select="count($EconomicDistanceCut2/EconomicDistanceCut2/distance2[@point_count &gt; 0])"/><!-- liczba wezlow potencjalnych licbza PE-->
-            <xsl:variable name="bit_max" select="round($len  div  ( $PE_Price div $Cable_Price ) + count($EconomicDistanceCut2/EconomicDistanceCut2/distance2[@cost_dist &gt; $PE_Price]) +10 )"/><!-- max licbza PE-->
+            <xsl:variable name="bit_max" select="round($len  div  ( $PE_Price div $Cable_Price ) + count($EconomicDistanceCut2/EconomicDistanceCut2/distance2[@cost_dist &gt; $PE_Price])  )"/><!-- max licbza PE-->
             
             
             <!-- pogrupujemy elementy co 50 metrow -->
             <!-- pogrupujemy elementy co 50 metrow -->
             <xsl:variable name="PointMatrixGroup">
             <xsl:variable name="PointMatrixGroup">
                 <PointMatrixGroup>
                 <PointMatrixGroup>
-                    <xsl:for-each-group select="$EconomicDistanceCut2/EconomicDistanceCut2/distance2" group-by="round( @distance div ( $PE_Price div $Cable_Price + 100 ))">
+                    <xsl:for-each-group select="$EconomicDistanceCut2/EconomicDistanceCut2/distance2" group-by="round( @distance div ( $PE_Price div $Cable_Price + 50 ))">
                         <PointMatrixGroupPos>
                         <PointMatrixGroupPos>
                             <xsl:variable name="elements_cnt_Pos" select="count(current-group()[@point_count &gt; 0])"/>
                             <xsl:variable name="elements_cnt_Pos" select="count(current-group()[@point_count &gt; 0])"/>
                             <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 ) )"/>