Changeset 239:53be0d6610b1 in orange

Timestamp:

09/04/03 22:21:25 (10 years ago)

Author:

janezd <janez.demsar@…>

Branch:

default

Convert:

4f3dace9ea69b9e159ec40084111ebe4fc20a4cf

Message:

no message

Location:

source

Files:

• Orange.dsp (modified) (2 diffs)
• include.dsp (modified) (1 diff)
• orange/cls_example.cpp (modified) (1 diff)
• orange/distvars.cpp (modified) (4 diffs)
• orange/distvars.hpp (modified) (3 diffs)
• orange/lib_kernel.cpp (modified) (2 diffs)
• orange/preprocessors.cpp (modified) (6 diffs)
• orange/preprocessors.hpp (modified) (2 diffs)
• orange/trindex.cpp (modified) (1 diff)

source/Orange.dsp

@@ -58 +58 @@
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=del "c:\program files\python22\lib\site-packages\orange\orange.pyd"  "c:\program files\upx" "c:\temp\orange\release\orange.pyd" -o "d:\ai\orange\modules\orange.pyd" rem copy "c:\temp\orange\release\orange.pyd" "c:\program files\python22\lib\site-packages\orange\orange.pyd"
+PostBuild_Desc=UPXing Orange
+PostBuild_Cmds=del "d:\ai\orange\modules\orange.pyd"    "c:\program files\upx" "c:\temp\orange\release\orange.pyd" -o "d:\ai\orange\modules\orange.pyd" rem copy "c:\temp\orange\release\orange.pyd" "d:\ai\orange\modules\orange.pyd"
 # End Special Build Tool
 
@@ -740 +741 @@
 # Begin Source File
 
-SOURCE=.\orange\linreg.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\orange\lookup.cpp
 

source/include.dsp

@@ -100 +100 @@
 # Begin Source File
 
-SOURCE=.\include\Nrutil.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\include\primes.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\pythag.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\include\statexceptions.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\svbksb.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\svdcmp.cpp
 # End Source File
 # End Group

source/orange/cls_example.cpp

@@ -295 +295 @@
     int index = (int)PyInt_AsLong(pyindex);
 
-    if (!index)
+    if (index>0)
       PYERROR(PyExc_IndexError, "Example.setweight: invalid weight id", PYNULL);      
 

source/orange/distvars.cpp

@@ -201 +201 @@
 NOT_IMPLEMENTED("percentile(float)")
 
-float TDistribution::density(const float &) const
-NOT_IMPLEMENTED("density(float)")
+float TDistribution::p(const float &) const
+NOT_IMPLEMENTED("p(float)")
 
 
@@ -321 +321 @@
   }
   CHECKVALTYPE(val.varType);
-  return (val.varType==TValue::INTVAR) ? p(int(val)) : density(float(val));
+  return (val.varType==TValue::INTVAR) ? p(int(val)) : p(float(val));
 }
 
@@ -1112 +1112 @@
 }
 
-float TContDistribution::density(const float &x) const
+float TContDistribution::p(const float &x) const
 { const_iterator rb = upper_bound(x);
   if (rb==end())
@@ -1183 +1183 @@
 
 
-float TGaussianDistribution::density(const float &x) const
+float TGaussianDistribution::p(const float &x) const
 { return abs * exp(-sqr((x-mean)/2/sigma)) / (sigma*sqrt(2*pi)); }
 

source/orange/distvars.hpp

@@ -110 +110 @@
   virtual float percentile(const float &) const;
   virtual float error() const;
-  virtual float density(const float &) const;
+  virtual float p(const float &) const;
 
   /* The below methods may be redefined (they are not implemented in TDistribution) */
@@ -226 +226 @@
   virtual void  addfloat(const float &f, const float &w = 1.0);
   virtual void  setfloat(const float &v, const float &w);
-  virtual float density(const float &) const;
+  virtual float p(const float &) const;
 
   virtual float average() const;
@@ -263 +263 @@
   virtual float randomFloat() const;
 
-  virtual float density(const float &) const;
+  virtual float p(const float &) const;
   virtual bool  noDeviation() const;
 };

source/orange/lib_kernel.cpp

@@ -2686 +2686 @@
       return PYNULL;
     
-    return PyFloat_FromDouble(cont->density(x));
+    return PyFloat_FromDouble(cont->p(x));
+  PyCATCH
+}
+
+
+// Note that this is actually density, not p!
+PyObject *ContDistribution_p(PyObject *self, PyObject *args) PYARGS(METH_VARARGS, "(x) -> float")
+{ PyTRY
+    TContDistribution *cont = getContDistribution(self);
+    float x;
+    if (!cont || !PyArg_ParseTuple(args, "f:ContDistribution.p", &x))
+      return PYNULL;
+    
+    return PyFloat_FromDouble(cont->p(x));
   PyCATCH
 }
@@ -2744 +2757 @@
       return PYNULL;
     
-    return PyFloat_FromDouble(SELF_AS(TGaussianDistribution).density(x));
+    return PyFloat_FromDouble(SELF_AS(TGaussianDistribution).p(x));
+  PyCATCH
+}
+
+// This is actually density, not p!
+PyObject *GaussianDistribution_p(PyObject *self, PyObject *args) PYARGS(METH_VARARGS, "(x) -> float")
+{ PyTRY
+    float x;
+    if (!PyArg_ParseTuple(args, "f:GaussianDistribution.p", &x))
+      return PYNULL;
+    
+    return PyFloat_FromDouble(SELF_AS(TGaussianDistribution).p(x));
   PyCATCH
 }

source/orange/preprocessors.cpp

@@ -311 +311 @@
   if (deviations)
     PITERATE(TVariableFloatMap, vi, deviations) {
-      const int pos = domain.getVarNum((*vi).first);
+      PVariable var = (*vi).first;
+      if (var->varType != TValue::FLOATVAR)
+        raiseError("attribute '%s' is not continuous", var->name.c_str());
+
+      const int pos = domain.getVarNum(var);
       ps.push_back(pair<int, float>(pos, (*vi).second));
 
@@ -319 +323 @@
   
   if (defaultDeviation) {
-    TVarList::const_iterator vi(domain.variables->begin());
+    TVarList::const_iterator vi(domain.attributes->begin());
     const vector<bool>::const_iterator bb = attributeUsed.begin();
     const_ITERATE(vector<bool>, bi, attributeUsed) {
@@ -445 +449 @@
 PExampleGenerator TPreprocessor_addGaussianClassNoise::operator()(PExampleGenerator gen, const int &weightID, int &newWeight)
 {
-  if (!gen->domain->classVar)
+  PVariable classVar = gen->domain->classVar;
+
+  if (!classVar)
     raiseError("Class-less domain");
+  if (classVar->varType != TValue::FLOATVAR)
+    raiseError("Class '%s' is not continuous", gen->domain->classVar->name.c_str());
 
   newWeight = weightID;
@@ -734 +742 @@
 TPreprocessor_discretize::TPreprocessor_discretize()
 : attributes(),
-  notClass(true),
+  discretizeClass(false),
   method()
 {}
@@ -741 +749 @@
 TPreprocessor_discretize::TPreprocessor_discretize(PVarList attrs, const bool &nocl, PDiscretization meth)
 : attributes(attrs),
-  notClass(nocl),
+  discretizeClass(nocl),
   method(meth)
 {}
@@ -764 +772 @@
       idx++;
     }
-    if (!notClass && (domain.classVar->varType == TValue::FLOATVAR))
+    if (discretizeClass && (domain.classVar->varType == TValue::FLOATVAR))
       discretizeId.push_back(idx);
   }

source/orange/preprocessors.hpp

@@ -259 +259 @@
 
   PVarList attributes; //P attributes to be discretized (all, if not defined or empty)
-  bool notClass; //P do not discretize the class attribute (default: true)
+  bool discretizeClass; //P also discretize the class attribute (default: false)
   PDiscretization method; //P discretization method
 
@@ -265 +265 @@
 
   TPreprocessor_discretize();
-  TPreprocessor_discretize(PVarList, const bool & = true, PDiscretization = PDiscretization());
+  TPreprocessor_discretize(PVarList, const bool & = false, PDiscretization = PDiscretization());
   virtual PExampleGenerator operator()(PExampleGenerator generators, const int &weightID, int &newWeight);
 };

source/orange/trindex.cpp

@@ -219 +219 @@
 PRandomIndices TMakeRandomIndicesN::operator()(const int &n, PFloatList ap)
 { if (!ap || !ap->size())
-    raiseError("invalid (empty) vector of probabilities");
+    raiseError("'p' not defined or empty");
+
+  float sum = 0;
+  for(vector<float>::const_iterator pis(ap->begin()), pie(ap->end()); pis!=pie; sum += (*(pis++)));
+  if (sum>=1.0)
+    raiseError("elements of 'p' sum to 1 or more");
+
   if (stratified==TMakeRandomIndices::STRATIFIED)
     raiseError("stratification not implemented");