talk with Clement better integration

1 files changed, 10 insertions, 12 deletions

diff --git a/DataList.lua b/DataList.lua
index 287d7dd..c70621a 100644
--- a/DataList.lua
+++ b/DataList.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 -- DataList: a container for plain DataSets.
--- Each sub dataset represents one class.
+-- Each sub dataset represents elements from only one class.
 --
 -- Authors: Corda, Farabet
 --------------------------------------------------------------------------------
@@ -12,7 +12,7 @@ function DataList:__init()
    self.datasets = {}
    self.nbClass = 0
    self.ClassName = {}
-   self.ClassRev = {}
+   self.ClassMax = 0
    self.nbSamples = 0
    self.targetIsProbability = false
    self.spatialTarget = false
@@ -68,17 +68,15 @@ end
 
 function DataList:appendDataSet(dataSet,className)
    table.insert(self.datasets,dataSet)
-   -- if self.nbSamples == 0 then
-   --    self.nbSamples = dataSet:size()
-   -- else
-   --    print(self.nbSamples/self.nbClass,dataSet:size())
-   --    self.nbSamples = math.floor(math.max(self.nbSamples/self.nbClass,
-   --                                         dataSet:size()))
-   -- end
-   if not self.ClassRev[className] then
-      self.ClassRev[className] = true
+   -- you can append the same class several times with this mechanism
+   if self.ClassName[className] then
+      self.ClassName[className] = self.ClassName[className] + dataSet:size()
+   else
+      self.ClassName[className] = dataSet:size()
       self.nbClass = self.nbClass + 1
       table.insert(self.ClassName,self.nbClass,className)
    end
-   self.nbSamples = self.nbSamples + dataSet:size()
+   self.ClassMax = 
+      math.floor(math.max(self.ClassMax,self.ClassName[className]))
+   self.nbSamples = self.ClassMax * self.nbClass
 end