Fix conflict

[factor.git] / basis / math / vectors / vectors.factor

diff --git a/basis/math/vectors/vectors.factor b/basis/math/vectors/vectors.factor
index 4d9a0916b5c37c6718e0b6a01154eddd65e2250f..eb5fa7b9705135ae33a099ea5b0ddf4aef1bb8bc 100644 (file)
--- a/basis/math/vectors/vectors.factor
+++ b/basis/math/vectors/vectors.factor
@@ -19,8 +19,8 @@ IN: math.vectors
 : vmax ( u v -- w ) [ max ] 2map ;
 : vmin ( u v -- w ) [ min ] 2map ;
 
-: vgreatest ( array -- vmax ) { -1.0/0.0 -1.0/0.0 } [ vmax ] reduce ; 
-: vleast    ( array -- vmax ) {  1.0/0.0  1.0/0.0 } [ vmin ] reduce ; 
+: vsupremum ( seq -- vmax ) [ ] [ vmax ] map-reduce ; 
+: vinfimum ( seq -- vmin ) [ ] [ vmin ] map-reduce ; 
 
 : v. ( u v -- x ) [ * ] [ + ] 2map-reduce ;
 : norm-sq ( v -- x ) [ absq ] [ + ] map-reduce ;