X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2Fdistance2.py;h=22da3526d76730566ec1bbb6549ad5dfb8f2a0e2;hp=17e41fe787100d08cc62677f87960d763833c0a1;hb=2cf6435f1492b63b9adf4e8256d88968638ed9bf;hpb=b24a2d1b7692bdb21cf037b026e0273ba547cef4

diff --git a/src/Tools/blocFissure/gmu/distance2.py b/src/Tools/blocFissure/gmu/distance2.py
index 17e41fe78..22da3526d 100644
--- a/src/Tools/blocFissure/gmu/distance2.py
+++ b/src/Tools/blocFissure/gmu/distance2.py
@@ -17,38 +17,40 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+"""calcul du carré de la distance entre deux points"""
 
 import logging
 
 # -----------------------------------------------------------------------------
-# --- calcul de distance carree entre deux points, jeux de coordonnees x,y,z
+# ---
 
 def distance2(xyz1, xyz2):
   """
   carré de la distance entre deux points donnés par des triplets [x,y,z]
   """
   #logging.info("start")
-  
-  d2 = 0
-  for i in range(3):
-    d2 += (xyz1[i]-xyz2[i])*(xyz1[i]-xyz2[i])
-  logging.debug('d2=%s', d2)
-  return d2
 
-# -----------------------------------------------------------------------------
-# --- test unitaire
-
-import unittest
-class Test_distance2(unittest.TestCase):
-
-  def setUp(self):
-    self.a=[0, 0, 0]
-    self.b=[3, 4, 5]
-    self.c=[-5,-4,-3]
-    
-  def test_calcul(self):
-    self.assertEqual(distance2(self.a, self.b), distance2(self.b, self.a))
-    self.assertEqual(distance2(self.a, self.b), distance2(self.a, self.c))
-    self.assertEqual(distance2(self.b, self.b), 0)
-    self.assertEqual(distance2(self.a, self.b), 50)
-        
\ No newline at end of file
+  dcarre = 0
+  for ijk in range(3):
+    dcarre += (xyz1[ijk]-xyz2[ijk])*(xyz1[ijk]-xyz2[ijk])
+  logging.debug('dcarre=%s', dcarre)
+
+  return dcarre
+
+## -----------------------------------------------------------------------------
+## --- test unitaire
+
+#import unittest
+#class Test_distance2(unittest.TestCase):
+  #"""test de la fonction"""
+
+  #def setUp(self):
+    #self.a=[0, 0, 0]
+    #self.b=[3, 4, 5]
+    #self.c=[-5,-4,-3]
+
+  #def test_calcul(self):
+    #self.assertEqual(distance2(self.a, self.b), distance2(self.b, self.a))
+    #self.assertEqual(distance2(self.a, self.b), distance2(self.a, self.c))
+    #self.assertEqual(distance2(self.b, self.b), 0)
+    #self.assertEqual(distance2(self.a, self.b), 50)