[GRASS-SVN] r32747 - grass/trunk/lib/iostream

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Aug 13 14:54:25 EDT 2008


Author: ltoma
Date: 2008-08-13 14:54:25 -0400 (Wed, 13 Aug 2008)
New Revision: 32747

Removed:
   grass/trunk/lib/iostream/minmaxheap_test.cc
Modified:
   grass/trunk/lib/iostream/ami_stream.cc
   grass/trunk/lib/iostream/mm.cc
   grass/trunk/lib/iostream/mm_utils.cc
   grass/trunk/lib/iostream/rtimer.cc
Log:
extended header to acknowledge contributors;  removed minmaxhea_test.cc

Modified: grass/trunk/lib/iostream/ami_stream.cc
===================================================================
--- grass/trunk/lib/iostream/ami_stream.cc	2008-08-13 18:46:46 UTC (rev 32746)
+++ grass/trunk/lib/iostream/ami_stream.cc	2008-08-13 18:54:25 UTC (rev 32747)
@@ -1,21 +1,39 @@
 /****************************************************************************
  * 
- *  MODULE:	iostream
+ *  MODULE:     iostream
  *
+
  *  COPYRIGHT (C) 2007 Laura Toma
  *   
+ * 
+
+ *  Iostream is a library that implements streams, external memory
+ *  sorting on streams, and an external memory priority queue on
+ *  streams. These are the fundamental components used in external
+ *  memory algorithms.  
+
+ * Credits: The library was developed by Laura Toma.  The kernel of
+ * class STREAM is based on the similar class existent in the GPL TPIE
+ * project developed at Duke University. The sorting and priority
+ * queue have been developed by Laura Toma based on communications
+ * with Rajiv Wickremesinghe. The library was developed as part of
+ * porting Terraflow to GRASS in 2001.  PEARL upgrades in 2003 by
+ * Rajiv Wickremesinghe as part of the Terracost project.
+
+ * 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
+
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *****************************************************************************/
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.  *
+ *  **************************************************************************/
 
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>

Deleted: grass/trunk/lib/iostream/minmaxheap_test.cc
===================================================================
--- grass/trunk/lib/iostream/minmaxheap_test.cc	2008-08-13 18:46:46 UTC (rev 32746)
+++ grass/trunk/lib/iostream/minmaxheap_test.cc	2008-08-13 18:54:25 UTC (rev 32747)
@@ -1,44 +0,0 @@
-/****************************************************************************
- * 
- *  MODULE:	r.terraflow
- *
- *  COPYRIGHT (C) 2007 Laura Toma
- *   
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *****************************************************************************/
-
-#include <grass/iostream/ami.h>
-#include <grass/iostream/minmaxheap.h>
-
-#if(0)
-#define TEST_SIZE (1<<20)
-
-int main() {
-  int m = TEST_SIZE/100;
-  MinMaxHeap<int> foo(TEST_SIZE);
-
-  for(int i=0; i<TEST_SIZE; i++) {
-	foo.insert(i);
-  }
-  int z;
-  cout << " ------------------------------" << endl;
-  for(int i=0; i<TEST_SIZE; i++) {
-	bool r;
-	r = foo.extract_min(z);
-	r = foo.extract_max(z);
-	if(i%m == 0) {
-	  cerr << i << endl;
-	}
-  }
-
-}
-#endif

Modified: grass/trunk/lib/iostream/mm.cc
===================================================================
--- grass/trunk/lib/iostream/mm.cc	2008-08-13 18:46:46 UTC (rev 32746)
+++ grass/trunk/lib/iostream/mm.cc	2008-08-13 18:54:25 UTC (rev 32747)
@@ -1,22 +1,40 @@
 /****************************************************************************
  * 
- *  MODULE:	iostream
+ *  MODULE:     iostream
  *
+
  *  COPYRIGHT (C) 2007 Laura Toma
  *   
+ * 
+
+ *  Iostream is a library that implements streams, external memory
+ *  sorting on streams, and an external memory priority queue on
+ *  streams. These are the fundamental components used in external
+ *  memory algorithms.  
+
+ * Credits: The library was developed by Laura Toma.  The kernel of
+ * class STREAM is based on the similar class existent in the GPL TPIE
+ * project developed at Duke University. The sorting and priority
+ * queue have been developed by Laura Toma based on communications
+ * with Rajiv Wickremesinghe. The library was developed as part of
+ * porting Terraflow to GRASS in 2001.  PEARL upgrades in 2003 by
+ * Rajiv Wickremesinghe as part of the Terracost project.
+
+ * 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
+
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *****************************************************************************/
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.  *
+ *  **************************************************************************/
 
 
+
 // A simple registration based memory manager.
 
 #include <stdio.h>

Modified: grass/trunk/lib/iostream/mm_utils.cc
===================================================================
--- grass/trunk/lib/iostream/mm_utils.cc	2008-08-13 18:46:46 UTC (rev 32746)
+++ grass/trunk/lib/iostream/mm_utils.cc	2008-08-13 18:54:25 UTC (rev 32747)
@@ -1,21 +1,39 @@
 /****************************************************************************
  * 
- *  MODULE:	iostream
+ *  MODULE:     iostream
  *
+
  *  COPYRIGHT (C) 2007 Laura Toma
  *   
+ * 
+
+ *  Iostream is a library that implements streams, external memory
+ *  sorting on streams, and an external memory priority queue on
+ *  streams. These are the fundamental components used in external
+ *  memory algorithms.  
+
+ * Credits: The library was developed by Laura Toma.  The kernel of
+ * class STREAM is based on the similar class existent in the GPL TPIE
+ * project developed at Duke University. The sorting and priority
+ * queue have been developed by Laura Toma based on communications
+ * with Rajiv Wickremesinghe. The library was developed as part of
+ * porting Terraflow to GRASS in 2001.  PEARL upgrades in 2003 by
+ * Rajiv Wickremesinghe as part of the Terracost project.
+
+ * 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
+
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *****************************************************************************/
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.  *
+ *  **************************************************************************/
 
+
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <ctype.h>
@@ -27,7 +45,6 @@
 //#include <mm.h>
 #include <grass/iostream/mm.h>
 
-
 void 
 LOG_avail_memo() {
   size_t sz_avail=0;

Modified: grass/trunk/lib/iostream/rtimer.cc
===================================================================
--- grass/trunk/lib/iostream/rtimer.cc	2008-08-13 18:46:46 UTC (rev 32746)
+++ grass/trunk/lib/iostream/rtimer.cc	2008-08-13 18:54:25 UTC (rev 32747)
@@ -1,21 +1,39 @@
 /****************************************************************************
  * 
- *  MODULE:	iostream
+ *  MODULE:     iostream
  *
+
  *  COPYRIGHT (C) 2007 Laura Toma
  *   
+ * 
+
+ *  Iostream is a library that implements streams, external memory
+ *  sorting on streams, and an external memory priority queue on
+ *  streams. These are the fundamental components used in external
+ *  memory algorithms.  
+
+ * Credits: The library was developed by Laura Toma.  The kernel of
+ * class STREAM is based on the similar class existent in the GPL TPIE
+ * project developed at Duke University. The sorting and priority
+ * queue have been developed by Laura Toma based on communications
+ * with Rajiv Wickremesinghe. The library was developed as part of
+ * porting Terraflow to GRASS in 2001.  PEARL upgrades in 2003 by
+ * Rajiv Wickremesinghe as part of the Terracost project.
+
+ * 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
+
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *****************************************************************************/
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.  *
+ *  **************************************************************************/
 
+
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <stdio.h>



More information about the grass-commit mailing list