added access methods in convolutions/ classes, a copy parameters method in GradientMachine. minor change in PNMLoader.

git-archimport-id: [email protected]/torch--devel--1.0--patch-70

Author: Ronan Collobert

convolutions/T4SpatialConvolution.h

@@ -76,7 +76,14 @@
              kernelWidthStep: (int)aDW
             kernelHeightStep: (int)aDH;
 
+-(int)numberOfInputPlanes;
 -(int)numberOfOutputPlanes;
+-(int)inputWidth;
+-(int)inputHeight;
+-(int)kernelWidth;
+-(int)kernelHeight;
+-(int)kernelWidthStep;
+-(int)kernelHeightStep;
 -(int)outputWidth;
 -(int)outputHeight;
 

convolutions/T4SpatialConvolution.m

@@ -235,11 +235,46 @@ -(T4Matrix*)backwardGradOutputs: (T4Matrix*)someGradOutputs inputs: (T4Matrix*)s
     return gradInputs;
 }
 
+-(int)numberOfInputPlanes
+{
+  return numInputPlanes;
+}
+
 -(int)numberOfOutputPlanes
 {
   return numOutputPlanes;
 }
 
+-(int)inputWidth
+{
+  return inputWidth;
+}
+
+-(int)inputHeight
+{
+  return inputHeight;
+}
+
+-(int)kernelWidth
+{
+  return kW;
+}
+
+-(int)kernelHeight
+{
+  return kH;
+}
+
+-(int)kernelWidthStep
+{
+  return dW;
+}
+
+-(int)kernelHeightStep
+{
+  return dH;
+}
+
 -(int)outputHeight
 {
   return outputHeight;

convolutions/T4SpatialSubSampling.h

@@ -73,6 +73,13 @@
             kernelHeightStep: (int)aDH;
 
 
+-(int)numberOfInputPlanes;
+-(int)inputWidth;
+-(int)inputHeight;
+-(int)kernelWidth;
+-(int)kernelHeight;
+-(int)kernelWidthStep;
+-(int)kernelHeightStep;
 -(int)outputWidth;
 -(int)outputHeight;
 

convolutions/T4SpatialSubSampling.m

@@ -203,6 +203,41 @@ -(T4Matrix*)backwardGradOutputs: (T4Matrix*)someGradOutputs inputs: (T4Matrix*)s
     return gradInputs;
 }
 
+-(int)numberOfInputPlanes
+{
+  return numInputPlanes;
+}
+
+-(int)inputWidth
+{
+  return inputWidth;
+}
+
+-(int)inputHeight
+{
+  return inputHeight;
+}
+
+-(int)kernelWidth
+{
+  return kW;
+}
+
+-(int)kernelHeight
+{
+  return kH;
+}
+
+-(int)kernelWidthStep
+{
+  return dW;
+}
+
+-(int)kernelHeightStep
+{
+  return dH;
+}
+
 -(int)outputHeight
 {
   return outputHeight;

convolutions/T4TemporalConvolution.h

@@ -41,4 +41,7 @@
            kernelTimeWidth: (int)aKW
             kernelTimeStep: (int)aDT;
 
+-(int)kernelTimeWidth;
+-(int)kernelTimeStep;
+
 @end

convolutions/T4TemporalConvolution.m

@@ -156,6 +156,16 @@ -(T4Matrix*)backwardGradOutputs: (T4Matrix*)someGradOutputs inputs: (T4Matrix*)s
   return gradInputs;
 }
 
+-(int)kernelTimeWidth
+{
+  return kW;
+}
+
+-(int)kernelTimeStep
+{
+  return dT;
+}
+
 -initWithCoder: (NSCoder*)aCoder
 {
   self = [super initWithCoder: aCoder];

convolutions/T4TemporalSubSampling.h

@@ -40,4 +40,7 @@
       kernelTimeWidth: (int)aKW
        kernelTimeStep: (int)aDT;
 
+-(int)kernelTimeWidth;
+-(int)kernelTimeStep;
+
 @end

convolutions/T4TemporalSubSampling.m

@@ -141,6 +141,16 @@ -(T4Matrix*)backwardGradOutputs: (T4Matrix*)someGradOutputs inputs: (T4Matrix*)s
   return gradInputs;
 }
 
+-(int)kernelTimeWidth
+{
+  return kW;
+}
+
+-(int)kernelTimeStep
+{
+  return dT;
+}
+
 -initWithCoder: (NSCoder*)aCoder
 {
   self = [super initWithCoder: aCoder];

datasets/T4PNMLoader.m

@@ -80,14 +80,14 @@ -(T4Matrix*)loadMatrixFromFile: (T4File*)aFile
   else
     imageHeight = theImageHeight;
 
-  int imageMaxValue = 0;
+  int pnmMaxValue = 0;
   if( (pnmType != 4) && (pnmType != 1) )
   {
     stringBuffer = [file stringToEndOfLine];
     if(!stringBuffer)
       T4Error(@"PNMLoader: file is not in a PNM format");
     charBuffer = [stringBuffer cString];
-    sscanf(charBuffer, "%d", &imageMaxValue);
+    sscanf(charBuffer, "%d", &pnmMaxValue);
   }
 
   int theImageType;
@@ -103,7 +103,7 @@ -(T4Matrix*)loadMatrixFromFile: (T4File*)aFile
   else
     imageType = theImageType;
 
-  T4Message(@"PNMLoader: detected image: <%d x %d> with max value: <%d> [mode %d]", imageWidth, imageHeight, imageMaxValue, pnmType);
+  T4Message(@"PNMLoader: detected image: <%d x %d> with max value: <%d> [mode %d]", imageWidth, imageHeight, pnmMaxValue, pnmType);
 
   // Reading
 
@@ -181,7 +181,7 @@ -(T4Matrix*)loadMatrixFromFile: (T4File*)aFile
 
     case 5:
     case 6:
-      if(imageMaxValue > 255)
+      if(pnmMaxValue > 255)
       {
         ucharBuffer = (unsigned char *)[T4Allocator sysAllocByteArrayWithCapacity: matrixSize*2];
 
@@ -197,7 +197,7 @@ -(T4Matrix*)loadMatrixFromFile: (T4File*)aFile
       {
         ucharBuffer = (unsigned char *)[T4Allocator sysAllocByteArrayWithCapacity: matrixSize];
 
-        if([file readBlocksInto: ucharBuffer blockSize: 1  numberOfBlocks: matrixSize*2] != matrixSize)
+        if([file readBlocksInto: ucharBuffer blockSize: 1  numberOfBlocks: matrixSize] != matrixSize)
           T4Error(@"PNMLoader: error while reading");
 
         for(i = 0; i < matrixSize; i++)

gradients/T4GradientMachine.h

@@ -42,6 +42,8 @@
 
 -setCriterion: (T4Criterion*)aCriterion;
 
+-copyParametersFromMachine: (T4GradientMachine*)aMachine;
+
 -(int)numberOfInputs;
 -(int)numberOfOutputs;
 -(T4Matrix*)outputs;

gradients/T4GradientMachine.m

@@ -292,6 +292,31 @@ -(T4Matrix*)backwardGradOutputs: (T4Matrix*)someGradOutputs inputs: (T4Matrix*)s
   return self;
 }
 
+
+-copyParametersFromMachine: (T4GradientMachine*)aMachine
+{
+  NSArray *copyParameters = [aMachine parameters];
+  int numSelfParameterMatrices = [parameters count];
+  int numCopyParameterMatrices = [copyParameters count];
+  int i;
+
+  if(numCopyParameterMatrices != numSelfParameterMatrices)
+    T4Error(@"GradientMachine: incompatible number of parameters during copy");
+
+  for(i = 0; i < numSelfParameterMatrices; i++)
+  {
+    T4Matrix *matrix = [parameters objectAtIndex: i];
+    T4Matrix *copyMatrix = [copyParameters objectAtIndex: i];
+
+    if([matrix numberOfRows] != [copyMatrix numberOfRows])
+      T4Error(@"GradientMachine: incompatible number of parameters during copy");
+
+    [matrix copyMatrix: copyMatrix];
+  }
+
+  return self;
+}
+
 -(int)numberOfInputs
 {
   return numInputs;