From fd66ca862d4499378719e2a635c9f97df28b763d Mon Sep 17 00:00:00 2001
From: Andrei Aiordachioaie <a.aiordachioaie@jacobs-university.de>
Date: Tue, 25 Aug 2009 13:33:09 +0200
Subject: Tiling & Indexing options added to rasql grammar

---
 storagemgr/sstoragelayout.hh | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

(limited to 'storagemgr/sstoragelayout.hh')

diff --git a/storagemgr/sstoragelayout.hh b/storagemgr/sstoragelayout.hh
index 4ac9e79..b3e2a25 100644
--- a/storagemgr/sstoragelayout.hh
+++ b/storagemgr/sstoragelayout.hh
@@ -5,6 +5,10 @@
 
 #include "raslib/minterval.hh"
 #include "relstorageif/dbstoragelayout.hh"
+#include "rasodmg/interesttiling.hh"
+#include "rasodmg/stattiling.hh"
+#include "rasodmg/dirdecompose.hh"
+#include "storagemgr/stgmddconfig.hh"
 
 
 /*
@@ -32,7 +36,16 @@ rasdaman GmbH.
 /****************************************************************************
  *
  *
+ * INCLUDE: storagelayout.hh
  *
+ * MODULE:  storagemgr
+ * CLASS:   StorageLayout
+ *
+ * CHANGE HISTORY (append further entries):
+ * when         who        what
+ * -----------------------------------------------------------------------
+ * 13-Nov-00    hoefner    creation of preliminary version
+ * 07-Jan-09    Shams      add tiling attributes
  * COMMENTS:
  *
  ****************************************************************************/
@@ -215,6 +228,16 @@ class StorageLayout
 		return the object which actually stores the option values.
 		*/
 		
+		// Functions added by Andrei Aiordachioaie, to match function definitions. (17-08-2009)
+		void setBBoxes(const vector<r_Minterval>& input);
+		void setSubTiling();
+		void resetSubTiling();
+		void setInterestThreshold(double i);
+		void setBorderThreshold(unsigned int b);
+		void setCellSize(int size);
+		void setDirDecomp(vector<r_Dir_Decompose>*);
+
+
 	protected: 
 		std::vector< r_Minterval > calcRegLayout(const r_Minterval& layout) const;
 		/*@Doc:
@@ -224,11 +247,27 @@ class StorageLayout
 		//@Man: Actual Parameters: 
 		//@{ 
 		
+		StgMddConfig* extraFeatures;
+		/*@Doc: actual features */
+		
 		DBStorageLayoutId myLayout;
 		//@Man: Persistent Representation of a StorageLayout object.
 		//@{
 		///All parameters are stored there.
 		//@}
+                std::vector< r_Minterval >
+                calcInterestLayout(const r_Minterval& tileDomain);
+
+		//@Man: Actual Parameters:
+		//@{
+                std::vector< r_Minterval >
+                calcAlignedLayout(const r_Minterval&);
+
+                std::vector< r_Minterval >
+                calcDirectionalLayout(const r_Minterval&);
+
+                std::vector< r_Minterval >
+                calcStatisticLayout(const r_Minterval&);
 
 		//@}
 		
-- 
cgit