diff -urN ibm-aix/MINDIST/src/AWGN.C linux/MINDIST/src/AWGN.C --- ibm-aix/MINDIST/src/AWGN.C 2003-09-10 10:22:44.000000000 -0400 +++ linux/MINDIST/src/AWGN.C 2005-05-09 05:28:11.000000000 -0400 @@ -95,11 +95,11 @@ count[i] = 0; } - for (i = 0; i < 9; i++) { + for (int i = 0; i < 9; i++) { moment[i] = 0; } - for (i = 0; i < NOV; i++) { + for (int i = 0; i < NOV; i++) { value = (*awgn).nextValue(); index = (int)(value*10) + 50; if (index < 0) { @@ -116,11 +116,11 @@ } } - for (i = 0; i < 100; i++) { + for (int i = 0; i < 100; i++) { cout << count[i]/(1.0*NOV) << "\n"; } - for (i = 0; i < 9; i++) { + for (int i = 0; i < 9; i++) { cout << moment[i]/(1.0*NOV) << "\n"; } diff -urN ibm-aix/MINDIST/src/BlaumSpectra.C linux/MINDIST/src/BlaumSpectra.C --- ibm-aix/MINDIST/src/BlaumSpectra.C 2003-09-12 04:05:26.000000000 -0400 +++ linux/MINDIST/src/BlaumSpectra.C 2005-05-09 05:27:21.000000000 -0400 @@ -17,10 +17,10 @@ H=new int* [M]; for(int i=0;i=0) H[i][T[i][j]]=1; } @@ -33,7 +33,7 @@ minWeight=N-K+1;tmpMinWeight=N-K+1; (*this).threshWeight=threshWeight; //neglecting weight larger than or equal to 50 codewords numCodeWordMinWeight=new int [threshWeight]; - for(i=0;i=0;i--){ + for(int i=m-1;i>=0;i--){ itmp=0; for(j=index[i]+1;j EPS) { outMessages[port][i] /=sum; } else { Binary files ibm-aix/MINDIST/src/Main and linux/MINDIST/src/Main differ diff -urN ibm-aix/MINDIST/src/Makefile linux/MINDIST/src/Makefile --- ibm-aix/MINDIST/src/Makefile 2003-09-10 10:25:47.000000000 -0400 +++ linux/MINDIST/src/Makefile 2005-05-09 06:10:00.000000000 -0400 @@ -1,19 +1,21 @@ # My compiler: -CC = xlC +CC = g++ # Virtual path for include files: #VPATH = ../include # Libraries: -LIB = -lcomplex -L/zurich/usr/matlab4/curr/extern/lib/ibm_rs -lm +#LIB = -lcomplex -L/zurich/usr/matlab4/curr/extern/lib/ibm_rs -lm +#LIB = -lcomplex -lm +LIB = -lm # Compiler flags: # --------------- # Normal setting: -#CCFLAGS = -I../include +CFLAGS = -I../include -Wno-deprecated # # For debugging (Note that -g disables inlining): -CCFLAGS = -I../include -g -qinfo=nocnv:notrd -qcheck -bloadmap -bnoquiet +#CCFLAGS = -I../include -g -qinfo=nocnv:notrd -qcheck -bloadmap -bnoquiet # # For optimization: @@ -35,7 +37,8 @@ #mytest.o: mytest.C iofnct.h random.h codes.h spadet.h ldpc.h Main: Main.o $(OBJ) - $(CC) $(CFLAGS) -o Main $(OBJ) $(LIB) -bmaxdata:0x80000000 + $(CC) $(CFLAGS) -o Main $(OBJ) $(LIB) +#-bmaxdata:0x80000000 @@ -86,9 +89,8 @@ #--------------- clean: clean_objects -clean_objects: `rm *.o` - - +clean_objects: + @rm -f *.o diff -urN ibm-aix/MINDIST/src/Node.C linux/MINDIST/src/Node.C --- ibm-aix/MINDIST/src/Node.C 2003-09-10 10:22:48.000000000 -0400 +++ linux/MINDIST/src/Node.C 2005-05-09 05:22:02.000000000 -0400 @@ -48,7 +48,7 @@ (*node1).outMessages[port1][i] = 0.0; //1.0/alphabetSize; } (*node2).outMessages[port2] = new double[alphabetSize]; - for (i = 0; i < alphabetSize; i++) { + for (int i = 0; i < alphabetSize; i++) { (*node2).outMessages[port2][i] = 0.0; //1.0/alphabetSize; } } @@ -63,7 +63,7 @@ break; } } - for (i = 0; i < (*node2).numNeighbours; i++) { + for (int i = 0; i < (*node2).numNeighbours; i++) { if ((*node2).neighbours[i] == node1) { index2 = i; break; diff -urN ibm-aix/MINDIST/src/ParityCheckNode.C linux/MINDIST/src/ParityCheckNode.C --- ibm-aix/MINDIST/src/ParityCheckNode.C 2003-09-10 10:28:39.000000000 -0400 +++ linux/MINDIST/src/ParityCheckNode.C 2005-05-09 05:23:10.000000000 -0400 @@ -75,12 +75,12 @@ } //backward in the internal factor graph backwardMessage[numNeighbours-1]=((*(VariableNode*)neighbours[numNeighbours-1]).getOutMessage(portNumbers[numNeighbours-1]))[0]; - for (i = numNeighbours-2; i >= 0; i--){ + for (int i = numNeighbours-2; i >= 0; i--){ backwardMessage[i]=LogModPlus(backwardMessage[i+1], ((*(VariableNode*)neighbours[i]).getOutMessage(portNumbers[i]))[0]); } //update the messages to the neighbours of this parity check node outMessages[0][0] = backwardMessage[1]; - for (i = 1; i < numNeighbours-1; i++){ + for (int i = 1; i < numNeighbours-1; i++){ outMessages[i][0]=LogModPlus(forwardMessage[i-1], backwardMessage[i+1]); } outMessages[numNeighbours-1][0] = forwardMessage[numNeighbours-2];