Merge branch 'V9_9_BR'

[modules/smesh.git] / src / Tools / blocFissure / gmu / distance2.py

diff --git a/src/Tools/blocFissure/gmu/distance2.py b/src/Tools/blocFissure/gmu/distance2.py
index 17e41fe787100d08cc62677f87960d763833c0a1..81b7cda3d89aafc3da0acb2718f42c8afe719d52 100644 (file)
--- a/src/Tools/blocFissure/gmu/distance2.py
+++ b/src/Tools/blocFissure/gmu/distance2.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2021  EDF R&D
+# Copyright (C) 2014-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -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)