Changeset 240:4a1d2e642552 in lemon-0.x

Timestamp:

03/23/04 18:28:47 (21 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@338

Message:

Elkészült a boundingbox osztály (boundingbox.h) és hozzá a tesztprogi.

Location:

src/work/athos/xy

Files:

• boundingbox.cc (added)
• boundingbox.h (added)
• xy.cc (modified) (1 diff)
• xy.h (modified) (8 diffs)

src/work/athos/xy/xy.cc

@@ -6 +6 @@
 {
 
-        cout << "Még egy skalárt is kérek (szépen)!" << endl;
+        cout << "Kérek szépen egy egész számot!" << endl;
         int s;
         cin >> s;

src/work/athos/xy/xy.h

@@ -13 +13 @@
   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;
       };
@@ -47 +39 @@
       ///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;
       };
@@ -54 +46 @@
       ///Multiplying the left hand side with a scalar
       xy<T>& operator *=(const T &u){
-        _x *= u;
-        _y *= u;
+        x *= u;
+        y *= u;
         return *this;
       };
@@ -61 +53 @@
       ///Dividing the left hand side by a scalar
       xy<T>& operator /=(const T &u){
-        _x /= u;
-        _y /= u;
+        x /= u;
+        y /= u;
         return *this;
       };
@@ -68 +60 @@
       ///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;
       };
   
@@ -97 +89 @@
       ///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);
       };
 
@@ -112 +104 @@
   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;
   }
@@ -125 +114 @@
   std::ostream& operator<<(std::ostream &os, xy<T> z)
   {
-    os << "(" << z.x() << ", " << z.y() << ")";
+    os << "(" << z.x << ", " << z.y << ")";
     return os;
   }