diff -r 3f76d1aa9d37 -r 4a1d2e642552 src/work/athos/xy/xy.h
--- a/src/work/athos/xy/xy.h	Tue Mar 23 13:47:31 2004 +0000
+++ b/src/work/athos/xy/xy.h	Tue Mar 23 17:28:47 2004 +0000
@@ -12,62 +12,54 @@
 
   template<typename T>
     class xy {
-    T _x,_y;
 
     public:
+
+      T x,y;     
       
       ///Default constructor: both coordinates become 0
-      xy() : _x(0), _y(0 ){ /*_x=_y=0;*/ }
+      xy() : x(0), y(0) {}
 
-      ///Constructing from coordinates
-      xy(T a, T b) : _x(a), _x(b) { /*_x=a; _y=b;*/ }
+      ///Constructing the instance from coordinates
+      xy(T a, T b) : x(a), y(a) { }
 
-      ///Gives back the x coordinate
-      T x(){
-	return _x;
-      };
-
-      ///Gives back the y coordinate
-      T y(){
-	return _y;
-      };
 
       ///Gives back the square of the norm of the vector
       T normSquare(){
-	return _x*_x+_y*_y;
+	return x*x+y*y;
       };
   
       ///Increments the left hand side by u
       xy<T>& operator +=(const xy<T>& u){
-	_x += u._x;
-	_y += u._y;
+	x += u.x;
+	y += u.y;
 	return *this;
       };
   
       ///Decrements the left hand side by u
       xy<T>& operator -=(const xy<T>& u){
-	_x -= u._x;
-	_y -= u._y;
+	x -= u.x;
+	y -= u.y;
 	return *this;
       };
 
       ///Multiplying the left hand side with a scalar
       xy<T>& operator *=(const T &u){
-	_x *= u;
-	_y *= u;
+	x *= u;
+	y *= u;
 	return *this;
       };
 
       ///Dividing the left hand side by a scalar
       xy<T>& operator /=(const T &u){
-	_x /= u;
-	_y /= u;
+	x /= u;
+	y /= u;
 	return *this;
       };
   
       ///Returns the scalar product of two vectors
       T operator *(const xy<T>& u){
-	return _x*u._x+_y*u._y;
+	return x*u.x+y*u.y;
       };
   
       ///Returns the sum of two vectors
@@ -96,12 +88,12 @@
 
       ///Testing equality
       bool operator==(const xy<T> &u){
-	return (_x==u._x) && (_y==u._y);
+	return (x==u.x) && (y==u.y);
       };
 
       ///Testing inequality
       bool operator!=(xy u){
-	return  (_x!=u._x) || (_y!=u._y);
+	return  (x!=u.x) || (y!=u.y);
       };
 
     };
@@ -111,11 +103,8 @@
   inline
   std::istream& operator>>(std::istream &is, xy<T> &z)
   {
-    ///This is not the best solution here: I didn't know how to solve this with friend functions
-    T a,b;
-    is >> a >> b;
-    xy<T> buf(a,b);
-    z=buf;
+
+    is >> z.x >> z.y;
     return is;
   }
 
@@ -124,7 +113,7 @@
   inline
   std::ostream& operator<<(std::ostream &os, xy<T> z)
   {
-    os << "(" << z.x() << ", " << z.y() << ")";
+    os << "(" << z.x << ", " << z.y << ")";
     return os;
   }