Changeset 4184

Timestamp:

06/14/07 21:32:43 (6 years ago)

Author:

hvolos

Message:

Added some throws to ensure sanity

Location:

SigProc/trunk/SigProc

Files:

• SigProc.h (modified) (2 diffs)
• fec_conv.cpp (modified) (13 diffs)

SigProc/trunk/SigProc/SigProc.h

@@ -44 +44 @@
 class TrellisEntry{
     public:
+        ///Contructor
+        TrellisEntry();
+        ///Destructor
+        ~TrellisEntry();        
         unsigned int previousState; ///< The state prior to the current state, used for tracing back the trellis
         unsigned short int symbolNo; ///< The symbol that caused the change of state to the currrent state
@@ -77 +81 @@
         void GenerateTrellisTable(unsigned int * generatorPolynomials);
 
-        ///Peforms modulo 2 addition to the bits of the input number (symbol)
+        ///Performs modulo 2 addition to the bits of the input number (symbol)
         unsigned short int Modulo2BitWiseAdd(unsigned short int inputNumber);
 };

SigProc/trunk/SigProc/fec_conv.cpp

@@ -25 +25 @@
 #include <math.h>
 
+
 namespace SigProc {
 
+//----------------------------Trellis Entry-------------------------------------
+TrellisEntry::TrellisEntry()
+{
+    previousState=0;
+    symbolNo=0;
+    distance=-1;
+}
+
+TrellisEntry::~TrellisEntry()
+{
+
+
+}
+
+//----------------------------trellisTable--------------------------------------
+
 trellisTable::trellisTable(
-unsigned int * generatorPolynomials,
-unsigned short int k,
-unsigned short int n,
-unsigned short K)
+    unsigned int * generatorPolynomials,
+    unsigned short int k_in,
+    unsigned short int n_in,
+    unsigned short K_in)
 {
     //Build trellis table
-    trellisTable::k=k;
-    trellisTable::n=n;
-    trellisTable::K=K;
+    trellisTable::k=k_in;
+    trellisTable::n=n_in;
+    trellisTable::K=K_in;
 
     //std::cout<<"Constructor, generatorPolynomials:";
-    for (int i=0;i<n;i++){
-
-        std::cout<<generatorPolynomials[i]<<" ";
-    }
+   // for (int i=0;i<n;i++){
+
+     //   std::cout<<generatorPolynomials[i]<<" ";
+    //}
     //std::cout<<std::endl;
 
     //std::cout<<"Input bits:"<<k<<" Contraint Length:"<<K<<std::endl;
+    trellisTable::nextState=NULL;
+    trellisTable::output=NULL;
     trellisTable::GenerateTrellisTable(generatorPolynomials);
 }
@@ -52 +71 @@
 {
     //Deallocate memory
-    for (unsigned int i = 0; i < trellisTable::numberOfTrellisStates; i++){
-        delete []trellisTable::nextState[i];
-    }
-    delete []trellisTable::nextState;
-
-
-    for (unsigned int i = 0; i < trellisTable::numberOfTrellisStates; i++){
-        delete []trellisTable::output[i];
-    }
-    delete []trellisTable::output;
+    if (trellisTable::nextState!=NULL){
+        for (unsigned int i = 0; i < trellisTable::numberOfTrellisStates; i++){
+            delete []trellisTable::nextState[i];
+        }
+        delete []trellisTable::nextState;
+    }
+
+    if (trellisTable::output!=NULL){
+        for (unsigned int i = 0; i < trellisTable::numberOfTrellisStates; i++){
+            delete []trellisTable::output[i];
+        }
+        delete []trellisTable::output;
+    }
 }
 
@@ -67 +89 @@
 void trellisTable::GenerateTrellisTable(unsigned int * generatorPolynomials)
 {
-
     numberOfTrellisStates=int(pow(2,(k*(K-1))));
     numberOfInputStates=int(pow(2,k));
+
     //std::cout<<"NumberOfTrellisStates="<<numberOfTrellisStates<<std::endl;
     //std::cout<<"numberOfInputStates="<<numberOfInputStates<<std::endl;
@@ -79 +101 @@
     }
 
+
     output = new unsigned int *[numberOfTrellisStates];
-
     for (unsigned int i = 0; i < numberOfTrellisStates; i++){
         output[i] = new unsigned int[numberOfInputStates];
     }
 
-    unsigned int ENCregister, tempOut;
+    unsigned int ENCregister=0, tempOut=0;
 
     for (unsigned int tstate=0;tstate<numberOfTrellisStates;tstate++){
         //std::cout<<tstate<<":";
         for (unsigned short int inputIdx=0;inputIdx<numberOfInputStates;inputIdx++){
+
             ENCregister=inputIdx*numberOfTrellisStates+tstate;
             nextState[tstate][inputIdx]=(unsigned int)floor(ENCregister/pow(2,k));
@@ -98 +121 @@
                 //      <<"power:"<<(unsigned short int)pow(2,n-bitNo-1)<<"tempOut:"<<tempOut<<"\n";
                 // std::cout<<"Mod2add:"<<Modulo2BitWiseAdd((ENCregister&generatorPolynomials[bitNo])*(unsigned short int)pow(2,n-bitNo-1))<<"\n";
+
                 tempOut+=Modulo2BitWiseAdd(ENCregister&generatorPolynomials[bitNo])* (unsigned short int)pow(2,n-bitNo-1);
             }
@@ -112 +136 @@
 {
     //std::cout<<"IN:"<<inputNumber;
-    unsigned int tempOut;
+    unsigned int tempOut=0;
     tempOut=inputNumber % 2;
     inputNumber>>=1;
+
     while (inputNumber>0){
         tempOut^=inputNumber % 2;
@@ -123 +148 @@
 }
 
+
+//-------------------------------fec_conv--------------------------------------
+
 void fec_conv::SetTrellisTable(trellisTable *theTrellisTableIn)
 {
@@ -133 +161 @@
     for (i=numberOfBits;i>0;i--){
         outputData[i-1]=decNumber % 2;
-        decNumber>>=1;
+
+        if (decNumber>0) decNumber>>=1;
     }
 }
@@ -168 +197 @@
         inbits+=tmp;
     }
+    
+    if (inbits>(unsigned int)(theTrellisTable->numberOfInputStates-1)){
+        std::cout<<"ERROR:fec_conv_encoder::Encode inbits>numberOfInputStates-1";
+        std::cout<<"inbits:"<<inbits<<" numberOfInputStates:"<<theTrellisTable->numberOfInputStates;
+        throw 0;
+    };
+
     //std::cout<<"state:"<<currentState<<" inbits:"<<inbits<<" outbits:"<<outbits<<"\n";
     outbits=theTrellisTable->output[currentState][inbits];
@@ -176 +212 @@
 }
 
+//------------------------------Decoder-----------------------------------------
+fec_conv_decoder::fec_conv_decoder()
+{
+    tracedBackSymbols=NULL;
+    theTrellis=NULL;
+    decodedSymbolIndex=0;
+    currentTrellisIndex=0;
+    mode=0;
+}
+
+fec_conv_decoder::~fec_conv_decoder()
+{
+    if (tracedBackSymbols!=NULL) delete  []tracedBackSymbols;
+
+    if (theTrellis!=NULL){
+        for (unsigned int i = 0; i < theTrellisTable->numberOfTrellisStates; i++){
+            delete theTrellis[i];
+        };
+        
+        delete []theTrellis;
+    }
+
+};
 void fec_conv_decoder::SetMode(unsigned short int mode)
 {
@@ -246 +305 @@
         inbits+=tmp;
     }
+
+   
     //std::cout<<"inbits:"<<inbits<<"\n";
     currentTrellisIndex++;
+
+    if (currentTrellisIndex>noOfSymbols2TraceBack){
+         std::cout<<"ERROR:fec_conv_decoder::Symbol2Decode currentTrellisIndex>Traceback length";
+        throw 0;
+    };
+
+     if (inbits>(unsigned int)(pow(theTrellisTable->n,2)-1)){
+        std::cout<<"ERROR:fec_conv_decoder::Symbol2Decode inbits>2^n-1\n";
+        std::cout<<"inbits:"<<inbits<<" numberOfInputStates:"<<pow(theTrellisTable->n,2)-1;
+        throw 0;
+    };
+
     //std::cout<<"currentTrellisIndex:"<<currentTrellisIndex<<"\n";
     for (unsigned int tstate=0;tstate<theTrellisTable->numberOfTrellisStates;tstate++){
@@ -340 +413 @@
             outputData,
             theTrellisTable->k);
+        } else {
+        std::cout<<"ERROR: fec_conv_decoder::GetDecodedSymbol attempt to get more symbols of what is available\n";
+        throw 0;
+    
         }
         
@@ -345 +422 @@
         
     } else {
-    }
-}
-
-fec_conv_decoder::fec_conv_decoder()
-{
-    tracedBackSymbols=NULL;
-    theTrellis=NULL;
-    decodedSymbolIndex=0;
-    currentTrellisIndex=0;
-    mode=0;
-}
-
-fec_conv_decoder::~fec_conv_decoder()
-{
-    if (tracedBackSymbols!=NULL) delete  []tracedBackSymbols;
-
-    if (theTrellis!=NULL){
-        for (unsigned int i = 0; i < theTrellisTable->numberOfTrellisStates; i++){
-            delete theTrellis[i];
-        };
-        
-        delete []theTrellis;
-    }
-
-};
+        std::cout<<"ERROR: fec_conv_decoder::GetDecodedSymbol trellis wasnt traced back properly\n";
+        throw 0;
+    }
+}
+
+
 
 } // namespace SigProc