Changeset 0cb90aa in tol

Timestamp:

Dec 11, 2010, 7:39:05 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

0e3f2d32

Parents:

7519264

Message:

Refs #1029
Handling dynamic memory in Matrix and Text
Text concatenation operators

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2790 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/stdlib/general/TolCint/tol_cint_casting.cpp (modified) (2 diffs)

tol/stdlib/general/TolCint/tol_cint_casting.cpp

@@ -17 +17 @@
   int columns_;
   double* buffer_;
+  int deleteBuffer_;
 
-  Matrix(int rows, int columns, double* buffer)
+  Matrix(int rows, int columns, double* buffer, int deleteBuffer=0)
   : rows_(rows),
     columns_(columns),
-    buffer_(buffer)
+    buffer_(buffer),
+    deleteBuffer_(deleteBuffer)
   {}
 
- ~Matrix() {}
+  Matrix(int rows, int columns)
+  : rows_(0),
+    columns_(0),
+    buffer_(NULL),
+    deleteBuffer_(false)
+  {
+    Alloc(rows. columns)
+  }
+
+ ~Matrix()
+  {
+    Free();
+  }
+
+  void Free()
+  {
+    if(deleteBuffer_ && buffer_) delete  [] buffer_;
+    buffer_ = NULL;
+    rows_ = 0;
+    columns_ = 0;
+    deleteBuffer_ = false;
+  }
+
+  void Alloc(int rows, int columns)
+  {
+    Free();
+    rows_ = rows;
+    columns_ = columns;
+    buffer_ = new double[rows*columns)
+    deleteBuffer_ = true;
+  }
 
 //Zero based vector access
@@ -55 +87 @@
   int length_;
   char* buffer_;
+  int deleteBuffer_;
 
-  Text(int length, char* buffer)
+  Text(int length, char* buffer, int deleteBuffer=0)
   : length_(length),
-    buffer_(buffer)
+    buffer_(buffer),
+    deleteBuffer_(deleteBuffer)
   {}
 
- ~Text() {}
+  Text(char* buffer)
+  : length_(strlen(buffer)),
+    buffer_(buffer),
+    deleteBuffer_(0)
+  {}
 
-  double& operator() (int i) const
+ ~Text() 
+  {
+    Free();
+  }
+
+  void Free()
+  {
+    if(deleteBuffer_ && buffer_) delete  [] buffer_;
+    length_ = 0;
+    buffer_ = NULL;
+    deleteBuffer_ = false;
+  }
+
+  void Alloc(int length)
+  {
+    Free();
+    length_ = length;
+    buffer_ = new char[length_+1)
+    deleteBuffer_ = true;
+  }
+
+//Zero based vector access
+  double& operator[] (int i) const
   {
     return(buffer_[i]);
   }
+//One based vector access
+  double& operator() (int i) const
+  {
+    return(buffer_[i-1]);
+  }
+//concat operations
+  Text operator + (const Text& right)
+  {
+    int len = length_ + right.length_;
+    char* buf = new char[len+1];
+    sprintf(buf,"%s%s",buffer_,right.buffer);
+    Text txt(len, buf, 1);
+    return(txt);
+  }
+  Text operator + (const char* right)
+  {
+    int len = length_ + strlen(right);
+    char* buf = new char[len+1];
+    sprintf(buf,"%s%s",buffer_,right);
+    Text txt(len, buf, 1);
+    return(txt);
+  }
+  Text operator + (int num)
+  {
+    int len = length_ + 64;
+    char* buf = new char[len+1];
+    sprintf(buf,"%s%ld",buffer_,num);
+    Text txt(len, buf, 1);
+    return(txt);
+  }
+  Text operator + (double num)
+  {
+    int len = length_ + 64;
+    char* buf = new char[len+1];
+    sprintf(buf,"%s%.16lg",buffer_,n);
+    Text txt(len, buf, 1);
+    return(txt);
+  }
 };
+
+