clean the code

source/sample/transformer/T2TTrainer.cpp

@@ -570,6 +570,8 @@ int T2TTrainer::LoadBuf(FILE * file, bool isSorted, int step)
 
         qsort(nodes, count, sizeof(SampleNode), CompareSampleNode);
 
+        /* distribute samples into buckets. In each bucket, sequences have
+           similar a length */
         if (bucketSize > 0) {
             int bucketCount = 0;
             int low = 0;
@@ -741,13 +743,10 @@ int T2TTrainer::LoadBatchLM(FILE * file,
     paddingDec->SetZeroAll();
 
     int seqSize = 0;
+    int wGold = 0;
     
     int * batchEncValues = new int[batchEnc->unitNum];
     MTYPE * goldOffsets = new MTYPE[gold->unitNum];
-    //MTYPE * paddingEncOffsets = new MTYPE[paddingEnc->unitNum];
-    //MTYPE * paddingDecOffsets = new MTYPE[paddingDec->unitNum];
-
-    int wGold = 0;
 
     memset(batchEncValues, 0, sizeof(int) * batchEnc->unitNum);
 
@@ -757,8 +756,7 @@ int T2TTrainer::LoadBatchLM(FILE * file,
         for(int w = 0; w < len; w++){
             int num = buf[seqOffset[s] + w];
             batchEncValues[(int)batchEnc->GetOffset2D(s - seq, w)] = num;
-            //paddingEncOffsets[wCount] = paddingEnc->GetOffset2D(s - seq, w);
-            //paddingDecOffsets[wCount] = paddingDec->GetOffset2D(s - seq, w);
+
             if (w > 0)
                 goldOffsets[wGold++] = gold->GetOffset3D(s - seq, w - 1, num);
             
@@ -783,8 +781,6 @@ int T2TTrainer::LoadBatchLM(FILE * file,
 
     batchEnc->SetData(batchEncValues, batchEnc->unitNum);
     gold->SetDataBatched(goldOffsets, 1.0F, wGold);
-    //paddingEnc->SetDataBatched(paddingEncOffsets, 1.0F, wCount);
-    //paddingDec->SetDataBatched(paddingDecOffsets, 1.0F, wCount);
 
     XTensor * tmp = NewTensorBuf(paddingEnc, devID, mem);
     _ConvertDataType(batchEnc, tmp);
@@ -798,8 +794,6 @@ int T2TTrainer::LoadBatchLM(FILE * file,
 
     delete[] batchEncValues;
     delete[] goldOffsets;
-    //delete[] paddingEncOffsets;
-    //delete[] paddingDecOffsets;
 
     fflush(tf);
 
@@ -841,8 +835,6 @@ int T2TTrainer::LoadBatchMT(FILE * file,
                             int devID, XMem * mem, 
 							bool isTraining)
 {
-    //if (nextSeq < 0 || nextSeq >= nseqBuf)
-    //    LoadBuf(file, isSorted, 2);
     if (nextBatch < 0 || nextBatch >= bufBatchSize) {
         LoadBuf(file, isSorted, 2);
 
@@ -904,44 +896,6 @@ int T2TTrainer::LoadBatchMT(FILE * file,
             qsort(bufBatch, bufBatchSize, sizeof(BatchNode), CompareBatchNode);
     }
 
-    /*int seq = MAX(nextSeq, 0);
-    int wcEnc = 0;
-    int wcDec = 0;
-    int wnEnc = 0;
-    int wnDec = 0;
-    int maxEnc = 0;
-    int maxDec = 0;
-    int sc = 0;
-
-    CheckNTErrors((nseqBuf - seq) % 2 == 0, "Input sequence must be paired!");
-
-    while(seq + sc < nseqBuf){
-
-        wnEnc = seqLen[seq + sc];
-        
-        wnDec = isDoubledEnd ? seqLen[seq + sc + 1] : seqLen[seq + sc + 1] - 1;
-        
-        int tcEnc = isBigBatch ? (wcEnc + wnEnc): MAX(maxEnc, wnEnc) * (sc + 2) / 2;
-        int tcDec = isBigBatch ? (wcDec + wnDec): MAX(maxDec, wnDec) * (sc + 2) / 2;
-
-        if(sc != 0 && sc > sBatch * 2 && (tcEnc > wBatch || tcDec > wBatch))
-            break;
-
-        wcEnc += wnEnc;
-        sc += 1;
-
-        if(maxEnc < wnEnc)
-            maxEnc = wnEnc;
-
-        wcDec += wnDec;
-        sc += 1;
-
-        if(maxDec < wnDec)
-            maxDec = wnDec;
-    }
-
-    nextSeq = seq + sc;*/
-
     if(bufBatchSize <= 0)
         return 0;
 
@@ -1072,12 +1026,6 @@ float T2TTrainer::GetProb(XTensor * output, XTensor * gold, XTensor * wordProbs)
     XTensor probs;
     InitTensor(&probs, output);
     
-    //XTensor logOutput;
-    //InitTensor(&logOutput, output);
-    //_Log(output, &logOutput);
-
-    /* probs[i,j] = output[i,j] * gold[i,j] */
-    //_Multiply(&logOutput, gold, &probs);
     _Multiply(output, gold, &probs);
     
     /* probability of each word */