l2-norm -> norm in the rest of the places

diff --git a/basis/math/vectors/vectors-tests.factor b/basis/math/vectors/vectors-tests.factor
index 0faeee341b3711bfa3bcbcb8eb9b4b6ed548c981..48de485977d188e6a3e57b3365ee457b957f879a 100644 (file)
--- a/basis/math/vectors/vectors-tests.factor
+++ b/basis/math/vectors/vectors-tests.factor
@@ -15,7 +15,7 @@ SPECIALIZED-ARRAY: int
 { 5 } [ { 1 2 } norm-sq ] unit-test
 { 13 } [ { 2 3 } norm-sq ] unit-test
 
-{ t } [ { 1 2 3 } [ l2-norm ] [ 2 p-norm ] bi = ] unit-test
+{ t } [ { 1 2 3 } [ norm ] [ 2 p-norm ] bi = ] unit-test
 { t } [ { 1 2 3 } 3 p-norm 3.301927248894626 1e-10 ~ ] unit-test
 
 { { 1.0  2.5  } } [ { 1.0 2.5 } { 2.5 1.0 } 0.0 vnlerp ] unit-test

diff --git a/basis/sequences/cords/cords.factor b/basis/sequences/cords/cords.factor
index c974834c249338d170533ae0ecec31d6169cd769..0576efdb86a1dd63b3168ae5a041d1d9c8726217 100644 (file)
--- a/basis/sequences/cords/cords.factor
+++ b/basis/sequences/cords/cords.factor
@@ -119,4 +119,4 @@ M: cord v*n '[ _ v*n ] cord-map ; inline
 M: cord v/n '[ _ v/n ] cord-map ; inline
 
 M: cord norm-sq [ norm-sq ] cord-both + ; inline
-M: cord distance v- l2-norm ; inline
+M: cord distance v- norm ; inline

diff --git a/extra/gml/coremath/coremath.factor b/extra/gml/coremath/coremath.factor
index 048b279c82655bdbf368b730f3df9c7e403f22fb..c7a6de23150880519a74a2920c1c8d409c7d0823 100644 (file)
--- a/extra/gml/coremath/coremath.factor
+++ b/extra/gml/coremath/coremath.factor
@@ -115,8 +115,8 @@ GML: abs ( x -- y )
     {
         { [ dup integer? ] [ abs ] }
         { [ dup float? ] [ abs ] }
-        { [ dup vec2d? ] [ l2-norm ] }
-        { [ dup vec3d? ] [ l2-norm ] }
+        { [ dup vec2d? ] [ norm ] }
+        { [ dup vec3d? ] [ norm ] }
     } cond ;
 
 : must-be-positive ( x -- x ) dup 0 < [ "Domain error" throw ] when ; inline

diff --git a/extra/gml/viewer/viewer.factor b/extra/gml/viewer/viewer.factor
index 07ef315adc2b10a4bb25d1e816117153ab200289..efa1d1a650d6371bab3f9b623f1cc6a720c989da 100644 (file)
--- a/extra/gml/viewer/viewer.factor
+++ b/extra/gml/viewer/viewer.factor
@@ -252,7 +252,7 @@ CONSTANT: edge-hitbox-radius 0.05
 
     ray-t 0.0 >= edge-t 0.0 0.5 between? and [
         source direction ray-t v*n v+
-        edge-source edge-direction edge-t v*n v+ v- l2-norm
+        edge-source edge-direction edge-t v*n v+ v- norm
         edge-hitbox-radius <
     ] [ f ] if ;
 

diff --git a/extra/jamshred/oint/oint.factor b/extra/jamshred/oint/oint.factor
index 63bc29d9f560a0a5707513e8ed31b1f57c3a4fbb..9b92c7b27451480ca28643138883c9e3bcb393f8 100644 (file)
--- a/extra/jamshred/oint/oint.factor
+++ b/extra/jamshred/oint/oint.factor
@@ -78,11 +78,11 @@ PRIVATE>
     [ location>> ] bi@ swap v- ;
 
 : distance ( oint oint -- distance )
-    distance-vector l2-norm ;
+    distance-vector norm ;
 
 : scalar-projection ( v1 v2 -- n )
     ! the scalar projection of v1 onto v2
-    [ vdot ] [ l2-norm ] bi / ;
+    [ vdot ] [ norm ] bi / ;
 
 : proj-perp ( u v -- w )
     dupd proj v- ;

diff --git a/extra/jamshred/tunnel/tunnel.factor b/extra/jamshred/tunnel/tunnel.factor
index 869d2c514d32cccd8934ba248a8706d34ee0bb1f..94e4d7b8b0a08858749f6be722fde2706c5487d3 100644 (file)
--- a/extra/jamshred/tunnel/tunnel.factor
+++ b/extra/jamshred/tunnel/tunnel.factor
@@ -91,7 +91,7 @@ CONSTANT: default-segment-radius 1
     over location>> swap v- swap forward>> proj-perp ;
 
 : distance-from-centre ( seg loc -- distance )
-    vector-to-centre l2-norm ;
+    vector-to-centre norm ;
 
 : wall-normal ( seg oint -- n )
     location>> vector-to-centre normalize ;
@@ -107,7 +107,7 @@ CONSTANT: distant 1000
     ] if ;
 
 :: collision-coefficient ( v w r -- c )
-    v l2-norm 0 = [
+    v norm 0 = [
         distant
     ] [
         v dup vdot :> a

diff --git a/extra/math/similarity/similarity.factor b/extra/math/similarity/similarity.factor
index 398e7fed8acb35fbcb33a249d063010ca409a7ac..34ff047d2af81fe778dfd94f386405952e60fc8c 100644 (file)
--- a/extra/math/similarity/similarity.factor
+++ b/extra/math/similarity/similarity.factor
@@ -7,13 +7,13 @@ sequences sequences.extras ;
 IN: math.similarity
 
 : euclidian-similarity ( a b -- n )
-    v- l2-norm 1 + recip ;
+    v- norm 1 + recip ;
 
 : pearson-similarity ( a b -- n )
     over length 3 < [ 2drop 1.0 ] [ population-corr 0.5 * 0.5 + ] if ;
 
 : cosine-similarity ( a b -- n )
-    [ vdot ] [ [ l2-norm ] bi@ * ] 2bi / ;
+    [ vdot ] [ [ norm ] bi@ * ] 2bi / ;
 
 <PRIVATE