Changeset 10588:5ea62b7b37bc in orange

Timestamp:

03/20/12 22:50:26 (14 months ago)

Author:

Janez Demšar <janez.demsar@…>

Branch:

default

Message:

Fixed conversion of Examples from lists and of ExampleTables from numpy arrays to work for domains with multiple classes (fixes #1145)

Location:

source/orange

Files:

• cls_example.cpp (modified) (3 diffs)
• lib_kernel.cpp (modified) (6 diffs)

source/orange/cls_example.cpp

@@ -60 +60 @@
   }
 
-  if (Py_ssize_t(dom->variables->size()) != PyList_Size(lst)) {
-    PyErr_Format(PyExc_IndexError, "invalid list size (%i items expected)", dom->variables->size());
+  int const nvars = dom->variables->size() + dom->classVars->size();
+  if (Py_ssize_t(nvars) != PyList_Size(lst)) {
+    PyErr_Format(PyExc_IndexError, "invalid list size (got %i, expected %i items)",
+        PyList_Size(lst), nvars);
     return false;
   }
@@ -67 +69 @@
   Py_ssize_t pos = 0;
   TExample::iterator ei(example.begin());
-  PITERATE(TVarList, vi, dom->variables) {
+  TVarList::iterator vi(dom->variables->begin());
+  TVarList::const_iterator const ve(dom->variables->end());
+  TVarList::const_iterator const ce(dom->classVars->end());
+  while(vi != ce) {
     PyObject *li=PyList_GetItem(lst, pos++);
     if (!li)
@@ -107 +112 @@
       else
         ei++;
+    }
+    if (++vi == ve) {
+        vi = dom->classVars->begin();
     }
   }

source/orange/lib_kernel.cpp

@@ -2926 +2926 @@
         PYERROR(PyExc_AttributeError, "two-dimensional array expected for an ExampleTable", NULL);
 
-     PVarList variables;
-     TVarList::const_iterator vi, ve;
+      PVarList variables;
+      TVarList::const_iterator vi;
 
       if (!domain) {
@@ -2938 +2938 @@
         domain = mlnew TDomain(PVariable(), lvariables);
         variables = domain->variables;
-        ve = variables->end();
       }
 
       else {
-        if (array->dimensions[1] != domain->variables->size())
-          PYERROR(PyExc_AttributeError, "the number of columns in the array doesn't match the number of attributes", NULL);
+          int const nvars = domain->variables->size() + domain->classVars->size();
+          if (array->dimensions[1] != nvars) {
+              PyErr_Format(PyExc_AttributeError,
+                  "the number of columns (%i) in the array doesn't match the number of attributes (%i)",
+                  array->dimensions[1], nvars);
+              return NULL;
+          }
 
        variables = domain->variables;
-       ve = variables->end();
-       for(vi = variables->begin(); vi!=ve; vi++)
-                  if (((*vi)->varType != TValue::INTVAR) && ((*vi)->varType != TValue::FLOATVAR))
-                      PYERROR(PyExc_TypeError, "cannot read the value of attribute '%s' from an array (unsupported attribute type)", NULL);
-            }
+       for(vi = variables->begin(); vi!=variables->end(); vi++)
+          if (((*vi)->varType != TValue::INTVAR) && ((*vi)->varType != TValue::FLOATVAR))
+              PYERROR(PyExc_TypeError, "cannot read the value of attribute '%s' from an array (unsupported attribute type)", NULL);
+       
+       for(vi = domain->classVars->begin(); vi!=domain->classVars->end(); vi++) 
+          if (((*vi)->varType != TValue::INTVAR) && ((*vi)->varType != TValue::FLOATVAR))
+              PYERROR(PyExc_TypeError, "cannot read the value of attribute '%s' from an array (unsupported attribute type)", NULL);
+      }
 
       const char arrayType = getArrayType(array);
@@ -2969 +2976 @@
       const int &strideMaskCol = mask ? mask->strides[1] : strideCol;
 
+      TVarList::const_iterator const vb(variables->begin());
+      TVarList::const_iterator const ve(variables->end());
+      TVarList::const_iterator const cb(domain->classVars->begin());
+      TVarList::const_iterator const ce(domain->classVars->end());
+
       try {
         TExample::iterator ei;
@@ -2980 +2992 @@
 
           #define ARRAYTYPE(TYPE) \
-            for(ei = nex->begin(), vi = variables->begin(); vi!=ve; vi++, ei++, elPtr += strideCol, maskPtr += strideMaskCol) \
+            for(ei = nex->begin(), vi = vb; vi!=ve; vi++, ei++, elPtr += strideCol, maskPtr += strideMaskCol) \
+              if ((*vi)->varType == TValue::INTVAR) \
+                intValInit(*ei, *(TYPE *)elPtr, mask && !*maskPtr ? valueDK : valueRegular); \
+              else \
+                floatValInit(*ei, *(TYPE *)elPtr, mask && !*maskPtr ? valueDK : valueRegular); \
+            for(vi = cb; vi!=ce; vi++, ei++, elPtr += strideCol, maskPtr += strideMaskCol) \
               if ((*vi)->varType == TValue::INTVAR) \
                 intValInit(*ei, *(TYPE *)elPtr, mask && !*maskPtr ? valueDK : valueRegular); \
@@ -2999 +3016 @@
 
             case 'f':
-              for(ei = nex->begin(), vi = variables->begin(); vi!=ve; vi++, ei++, elPtr += strideCol, maskPtr += strideMaskCol)
+              for(ei = nex->begin(), vi = vb; vi!=ve; vi++, ei++, elPtr += strideCol, maskPtr += strideMaskCol)
+                if ((*vi)->varType == TValue::INTVAR)
+                  intValInit(*ei, int(floor(0.5 + *(float *)elPtr)), mask && !*maskPtr ? valueDK : valueRegular);
+                else
+                  floatValInit(*ei, *(float *)elPtr, mask && !*maskPtr ? valueDK : valueRegular);
+              for(vi = cb; vi!=ce; vi++, ei++, elPtr += strideCol, maskPtr += strideMaskCol)
                 if ((*vi)->varType == TValue::INTVAR)
                   intValInit(*ei, int(floor(0.5 + *(float *)elPtr)), mask && !*maskPtr ? valueDK : valueRegular);
@@ -3008 +3030 @@
             case 'd':
               for(ei = nex->begin(), vi = variables->begin(); vi!=ve; vi++, ei++, elPtr += strideCol, maskPtr += strideMaskCol)
+                if ((*vi)->varType == TValue::INTVAR)
+                  intValInit(*ei, int(floor(0.5 + *(double *)elPtr)), mask && !*maskPtr ? valueDK : valueRegular);
+                else
+                  floatValInit(*ei, *(double *)elPtr, mask && !*maskPtr ? valueDK : valueRegular);
+              for(vi = cb; vi!=ce; vi++, ei++, elPtr += strideCol, maskPtr += strideMaskCol)
                 if ((*vi)->varType == TValue::INTVAR)
                   intValInit(*ei, int(floor(0.5 + *(double *)elPtr)), mask && !*maskPtr ? valueDK : valueRegular);