Changeset a392913 in tol

Timestamp:

Nov 13, 2009, 4:09:17 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

cc77af9

Parents:

95ca6b7

Message:

Using VMatrix wen possible
New methods match.feature.in.interval, extract.feature, extract.feature.rows

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

File:

• tol_pkg/MatEncode/MatEncode.tol (modified) (9 diffs)

tol_pkg/MatEncode/MatEncode.tol

@@ -10 +10 @@
 [[
 
-#Require HashMap;
-#Require MatQuery;
+  #Require HashMap;
+  #Require MatQuery;
 
 Text _.autodoc.description = "Handling and storing generic features, "
@@ -37 +37 @@
   Static Text _.autodoc.member.get = "Returns the stored value corresponding "
   "to this feature related to an individual entity.";
-  Anything get(Matrix store, Real entity)
+  Anything get(VMatrix store, Real entity)
   ////////////////////////////////////////////////////////////////////////////
 };
@@ -65 +65 @@
   
   ////////////////////////////////////////////////////////////////////////////
-  Anything get(Matrix store, Real entity)
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    MatDat(store, entity, _.position)
+  Anything get(VMatrix store, Real entity)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    VMatDat(store, entity, _.position)
   }
 };
@@ -103 +103 @@
 
   ////////////////////////////////////////////////////////////////////////////
-  Anything get(Matrix store, Real entity)
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    Real idx = MatDat(store, entity, _.position);
+  Anything get(VMatrix store, Real entity)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    Real idx = VMatDat(store, entity, _.position);
     _.domain[idx]
   };
@@ -126 +126 @@
   //In each row of this matrix are stored the values or indexes of features
   //related to an individual entity
-  Matrix _.data = Rand(0,0,0,0);
+  VMatrix _.data = Rand(0,0,0,0);
 
   ////////////////////////////////////////////////////////////////////////////
@@ -162 +162 @@
 
   ////////////////////////////////////////////////////////////////////////////
-  Text _.autodoc.member.feature.index = "Returns the index of a feature or 0 "
-  "if it not exists";
-  Real feature.index(Text name)
+  Text _.autodoc.member.get.feature.index = "Returns the index of a feature "
+  "or 0 if it not exists";
+  Real get.feature.index(Text name)
   ////////////////////////////////////////////////////////////////////////////
   {
@@ -195 +195 @@
   Text _.autodoc.member.match.feature.with.value = 
   "Returns a column matrix with True in rows where given feature has "
-  "specified value";
+  "specified value, numerical or not. If the value is not numeric argument "
+  "'value.id' must be its name to search it in feature domain";
   VMatrix match.feature.with.value(
     Text feature.name, 
@@ -201 +202 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    Real num = _.feature.index(feature.name);
+    Real num = get.feature.index(feature.name);
     @Feature f = _.feature[num];
     Real value = If(f::is.numeric(0),
@@ -210 +211 @@
 
   ////////////////////////////////////////////////////////////////////////////
-  Text _.autodoc.member.and.match.feature.with.value = 
-  "Returns a column matrix with True in rows where given feature has "
-  "specified value";
-  VMatrix and.match.feature.with.value(
-    Text feature.name, 
-    Anything value.id, //Text value identifier in domain or  Real value
-    VMatrix match)
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    And(match,select.feature.with.value(feature.name,value.id))
+  Text _.autodoc.member.match.feature.in.interval = 
+  "Returns a column matrix with True in rows where given numerical feature "
+  "whose cell is inside the interval defined as: \n"
+  "  [min,max]: if minIncluded=True  and minIncluded=True\n"
+  "  (min,max]: if minIncluded=False and minIncluded=True\n"
+  "  [min,max): if minIncluded=True  and minIncluded=False\n"
+  "  (min,max): if minIncluded=False and minIncluded=False\n";
+  VMatrix match.feature.in.interval(
+    Text feature.name, 
+    Real minIncluded,
+    Real min, 
+    Real max,
+    Real maxIncluded) 
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    Real num = get.feature.index(feature.name);
+    @Feature f = _.feature[num];
+    MatQuery::MatchRowsInInterval(
+      SubCol(_.data,[[num]]),
+      minIncluded,
+      min, 
+      max,
+      maxIncluded)
+  };
+
+  ////////////////////////////////////////////////////////////////////////////
+  Text _.autodoc.member.extract.feature = 
+  "Returns a column matrix with all rows with numerical code of a given "
+  "feature";
+  VMatrix extract.feature(
+    Text feature.name, 
+    Set row.indexes) //Text value identifier in domain or  Real value
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    Real col = get.feature.index(feature.name);
+    SubCol(_.data,[[col]])
+  };
+
+  ////////////////////////////////////////////////////////////////////////////
+  Text _.autodoc.member.extract.feature.rows = 
+  "Returns a column matrix with selected rows with numerical code of a "
+  "given feature";
+  VMatrix extract.feature.rows(
+    Text feature.name, 
+    Set row.indexes) //Text value identifier in domain or  Real value
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    Real col = get.feature.index(feature.name);
+    SubRow(SubCol(_.data,[[col]]),row.indexes)
   }
+
+
 }