IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1043


Ignore:
Timestamp:
Jun 14, 2004, 5:09:26 PM (22 years ago)
Author:
desonia
Message:

folded in last-minute bug fixes from the main trunk.

Location:
branches/rel1/psLib
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/rel1/psLib/src/Makefile.Globals

    r1008 r1043  
    55##  Assumptions:    Variable "prefix" already defined
    66##
    7 ##  $Revision: 1.10 $  $Name: not supported by cvs2svn $
    8 ##  $Date: 2004-06-12 01:33:16 $
     7##  $Revision: 1.10.2.1 $  $Name: not supported by cvs2svn $
     8##  $Date: 2004-06-15 03:09:15 $
    99##
    1010##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4646# Set initial value for LDFLAGS which will include all OS common flags for GCC and required libraries.
    4747
    48 LDFLAGS := -g2 -pipe -lcfitsio -lgsl -lgslcblas -lfftw3f
     48EXTLIBS := -lcfitsio -lgsl -lgslcblas -lfftw3f
     49LDFLAGS := -g2 -pipe $(EXTLIBS)
    4950
    5051# Define or refine variables for the Linux OS
    … …  
    6465    CFLAGS += -Wno-long-double -DDARWIN
    6566    CFLAGS_RELOC := $(CFLAGS)
     67    LDFLAGS := $(LDFLAGS) -lmx
    6668    LDFLAGS_SO := $(LDFLAGS) -bundle -flat_namespace -undefined suppress
    6769    LDFLAGS_DLL := $(LDFLAGS) -dynamiclib
    … …  
    7072    DOCS =
    7173    BUILD_DYNAMIC1 = libtool -dynamic
    72     BUILD_DYNAMIC2 = -lm -lgcc -o
     74    BUILD_DYNAMIC2 = -lm -lmx -lgcc $(EXTLIBS) -o
    7375endif
    7476

  • branches/rel1/psLib/src/collections/psBitSet.c

    r965 r1043  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2004-06-10 00:29:09 $
     12 *  @version $Revision: 1.6.2.1 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2004-06-15 03:09:18 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    222222    int i = 0;
    223223    int numBits = inBitSet->n*8;
    224     char* outString = psAlloc((size_t)numBits);
     224    char* outString = psAlloc((size_t)numBits+1);
    225225    for(i=0; i<numBits; i++) {
    226226        outString[numBits-i-1] = (psBitSetTest(inBitSet, i) == 1)?'1':'0';
    227227    }
    228228
     229    outString[numBits] = 0;
     230
    229231    return outString;
    230232}

  • branches/rel1/psLib/src/sysUtils/psHash.d

    r986 r1043  
    11psHash.o psHash.d : psHash.c psHash.h ../collections/psList.h \
    22  ../collections/psVector.h ../collections/psType.h \
    3   ../sysUtils/psMemory.h psMemory.h psString.h psTrace.h psAbort.h
     3  ../sysUtils/psMemory.h psString.h psTrace.h psAbort.h

  • branches/rel1/psLib/src/types/psBitSet.c

    r965 r1043  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2004-06-10 00:29:09 $
     12 *  @version $Revision: 1.6.2.1 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2004-06-15 03:09:18 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    222222    int i = 0;
    223223    int numBits = inBitSet->n*8;
    224     char* outString = psAlloc((size_t)numBits);
     224    char* outString = psAlloc((size_t)numBits+1);
    225225    for(i=0; i<numBits; i++) {
    226226        outString[numBits-i-1] = (psBitSetTest(inBitSet, i) == 1)?'1':'0';
    227227    }
    228228
     229    outString[numBits] = 0;
     230
    229231    return outString;
    230232}

  • branches/rel1/psLib/test/Makefile

    r1021 r1043  
    33##  Makefile:   test
    44##
    5 ##  $Revision: 1.5 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-06-14 19:38:06 $
     5##  $Revision: 1.5.2.1 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-06-15 03:09:20 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4747
    4848libpstest.$(DLL): $(SRC_OBJS)
    49         $(CC) $(LDFLAGS_DLL) $(SRC_OBJS) -o $@ 
     49        $(CC) $(LDFLAGS_DLL) -L../lib -lpslib $(SRC_OBJS) -o $@ 
    5050
    5151# Define PHONY target "install" which will install necessary files

  • branches/rel1/psLib/test/collections/verified/tst_psBitSet_01.stdout

    r1034 r1043  
    66
    77Creating psBitSet with 24 bits...
    8 000000000000000000000000Þ
     8000000000000000000000000
    99
    1010
    … …  
    2020Setting third bit...
    2121Setting last bit...
    22 100000000000000000000101Þ
     22100000000000000000000101
    2323
    2424

  • branches/rel1/psLib/test/collections/verified/tst_psBitSet_02.stdout

    r1034 r1043  
    55\**********************************************************************************/
    66
    7 000000000000000000000000Þ
    8 000000000000000000000000Þ
     7000000000000000000000000
     8000000000000000000000000
    99
    1010Setting all bits true...
    11 111111111111111111111111Þ
    12 111111111111111111111111Þ
     11111111111111111111111111
     12111111111111111111111111
    1313
    1414
    … …  
    2222
    2323Result:
    24 111111111111111111111111Þ
     24111111111111111111111111
    2525
    2626---> TESTPOINT PASSED (psBitSet{Perform binary AND with psBitSets} | tst_psBitSet_02.c)

  • branches/rel1/psLib/test/collections/verified/tst_psBitSet_03.stdout

    r1034 r1043  
    55\**********************************************************************************/
    66
    7 000000000000000000000000Þ
    8 000000000000000000000000Þ
     7000000000000000000000000
     8000000000000000000000000
    99
    1010Setting all bits true...
    11 111111111111111111111111Þ
    12 111111111111111111111111Þ
     11111111111111111111111111
     12111111111111111111111111
    1313
    1414
    … …  
    2222
    2323Result:
    24 111111111111111111111111Þ
     24111111111111111111111111
    2525
    2626---> TESTPOINT PASSED (psBitSet{Perform binary OR with psBitSets} | tst_psBitSet_03.c)

  • branches/rel1/psLib/test/collections/verified/tst_psBitSet_04.stdout

    r1034 r1043  
    55\**********************************************************************************/
    66
    7 000000000000000000000000Þ
    8 000000000000000000000000Þ
     7000000000000000000000000
     8000000000000000000000000
    99
    1010Setting all bits true...
    11 111111111111111111111111Þ
    12 111111111111111111111111Þ
     11111111111111111111111111
     12111111111111111111111111
    1313
    1414
    … …  
    2222
    2323Result:
    24 000000000000000000000000Þ
     24000000000000000000000000
    2525
    2626---> TESTPOINT PASSED (psBitSet{Perform binary XOR with psBitSets} | tst_psBitSet_04.c)

  • branches/rel1/psLib/test/collections/verified/tst_psBitSet_05.stdout

    r1034 r1043  
    55\**********************************************************************************/
    66
    7 000000000000000000000000Þ
    8 0000000000000000000000000000000000000000Þ
     7000000000000000000000000
     80000000000000000000000000000000000000000
    99
    1010

  • branches/rel1/psLib/test/collections/verified/tst_psBitSet_06.stdout

    r1034 r1043  
    55\**********************************************************************************/
    66
    7 000000000000000000000000Þ
    8 000000000000000000000000Þ
     7000000000000000000000000
     8000000000000000000000000
    99
    1010

  • branches/rel1/psLib/test/dataManip/Makefile

    r1011 r1043  
    33##  Makefile:   test/sysUtils
    44##
    5 ##  $Revision: 1.14 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-06-12 02:17:42 $
     5##  $Revision: 1.14.2.1 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-06-15 03:09:23 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    6666
    6767%   : builddir/%.o
    68         $(CC) -o $@ $< -L$(PSLIB_LIB_DIR) -lpslib -lpstest -lgsl -lgslcblas $(LDFLAGS)
     68        $(CC) -o $@ $< -L$(PSLIB_LIB_DIR) -lpslib -lpstest $(LDFLAGS)
    6969
    7070distclean: clean

  • branches/rel1/psLib/test/image/tst_psImageStats00.c

    r904 r1043  
    6565        for (i=0;i<tmpImage->numRows;i++) {
    6666            for (j=0;j<tmpImage->numCols;j++) {
    67                 tmpImage->data.F32[i][j] = (float) (i + j);
     67                tmpImage->data.F32[i][j] = (float) (i + j + 0.1);
    6868            }
    6969        }

  • branches/rel1/psLib/test/image/verified/tst_psImageStats00.stdout

    r1034 r1043  
    88\**********************************************************************************/
    99
    10 Bin number 0 bounds: (0.000000 - 0.100000) data (1)
    11 Bin number 1 bounds: (0.100000 - 0.200000) data (0)
     10Bin number 0 bounds: (0.000000 - 0.100000) data (0)
     11Bin number 1 bounds: (0.100000 - 0.200000) data (1)
    1212Bin number 2 bounds: (0.200000 - 0.300000) data (0)
    1313Bin number 3 bounds: (0.300000 - 0.400000) data (0)
    … …  
    3737\**********************************************************************************/
    3838
    39 Bin number 0 bounds: (0.000000 - 0.100000) data (1)
    40 Bin number 1 bounds: (0.100000 - 0.200000) data (0)
     39Bin number 0 bounds: (0.000000 - 0.100000) data (0)
     40Bin number 1 bounds: (0.100000 - 0.200000) data (1)
    4141Bin number 2 bounds: (0.200000 - 0.300000) data (0)
    4242Bin number 3 bounds: (0.300000 - 0.400000) data (0)
    … …  
    9191Bin number 11 bounds: (18.150000 - 19.799999) data (1)
    9292Bin number 12 bounds: (19.799999 - 21.449999) data (2)
    93 Bin number 13 bounds: (21.449999 - 23.100000) data (2)
    94 Bin number 14 bounds: (23.100000 - 24.750000) data (1)
     93Bin number 13 bounds: (21.449999 - 23.100000) data (1)
     94Bin number 14 bounds: (23.100000 - 24.750000) data (2)
    9595Bin number 15 bounds: (24.750000 - 26.400000) data (2)
    96 Bin number 16 bounds: (26.400000 - 28.049999) data (2)
    97 Bin number 17 bounds: (28.049999 - 29.699999) data (1)
     96Bin number 16 bounds: (26.400000 - 28.049999) data (1)
     97Bin number 17 bounds: (28.049999 - 29.699999) data (2)
    9898Bin number 18 bounds: (29.699999 - 31.350000) data (2)
    9999Bin number 19 bounds: (31.350000 - 33.000000) data (0)
    … …  
    120120Bin number 11 bounds: (18.150000 - 19.799999) data (1)
    121121Bin number 12 bounds: (19.799999 - 21.449999) data (2)
    122 Bin number 13 bounds: (21.449999 - 23.100000) data (2)
    123 Bin number 14 bounds: (23.100000 - 24.750000) data (1)
     122Bin number 13 bounds: (21.449999 - 23.100000) data (1)
     123Bin number 14 bounds: (23.100000 - 24.750000) data (2)
    124124Bin number 15 bounds: (24.750000 - 26.400000) data (2)
    125 Bin number 16 bounds: (26.400000 - 28.049999) data (2)
    126 Bin number 17 bounds: (28.049999 - 29.699999) data (1)
     125Bin number 16 bounds: (26.400000 - 28.049999) data (1)
     126Bin number 17 bounds: (28.049999 - 29.699999) data (2)
    127127Bin number 18 bounds: (29.699999 - 31.350000) data (2)
    128128Bin number 19 bounds: (31.350000 - 33.000000) data (0)
    … …  
    161161Bin number 11 bounds: (18.150000 - 19.799999) data (1)
    162162Bin number 12 bounds: (19.799999 - 21.449999) data (2)
    163 Bin number 13 bounds: (21.449999 - 23.100000) data (2)
    164 Bin number 14 bounds: (23.100000 - 24.750000) data (1)
     163Bin number 13 bounds: (21.449999 - 23.100000) data (1)
     164Bin number 14 bounds: (23.100000 - 24.750000) data (2)
    165165Bin number 15 bounds: (24.750000 - 26.400000) data (2)
    166 Bin number 16 bounds: (26.400000 - 28.049999) data (2)
    167 Bin number 17 bounds: (28.049999 - 29.699999) data (1)
     166Bin number 16 bounds: (26.400000 - 28.049999) data (1)
     167Bin number 17 bounds: (28.049999 - 29.699999) data (2)
    168168Bin number 18 bounds: (29.699999 - 31.350000) data (2)
    169169Bin number 19 bounds: (31.350000 - 33.000000) data (0)
    … …  
    190190Bin number 11 bounds: (18.150000 - 19.799999) data (1)
    191191Bin number 12 bounds: (19.799999 - 21.449999) data (2)
    192 Bin number 13 bounds: (21.449999 - 23.100000) data (2)
    193 Bin number 14 bounds: (23.100000 - 24.750000) data (1)
     192Bin number 13 bounds: (21.449999 - 23.100000) data (1)
     193Bin number 14 bounds: (23.100000 - 24.750000) data (2)
    194194Bin number 15 bounds: (24.750000 - 26.400000) data (2)
    195 Bin number 16 bounds: (26.400000 - 28.049999) data (2)
    196 Bin number 17 bounds: (28.049999 - 29.699999) data (1)
     195Bin number 16 bounds: (26.400000 - 28.049999) data (1)
     196Bin number 17 bounds: (28.049999 - 29.699999) data (2)
    197197Bin number 18 bounds: (29.699999 - 31.350000) data (2)
    198198Bin number 19 bounds: (31.350000 - 33.000000) data (0)
    … …  
    222222Bin number 2 bounds: (6.400000 - 9.600000) data (27)
    223223Bin number 3 bounds: (9.600000 - 12.800000) data (36)
    224 Bin number 4 bounds: (12.800000 - 16.000000) data (62)
    225 Bin number 5 bounds: (16.000000 - 19.200001) data (57)
     224Bin number 4 bounds: (12.800000 - 16.000000) data (45)
     225Bin number 5 bounds: (16.000000 - 19.200001) data (74)
    226226Bin number 6 bounds: (19.200001 - 22.400000) data (66)
    227227Bin number 7 bounds: (22.400000 - 25.600000) data (75)
    228228Bin number 8 bounds: (25.600000 - 28.800001) data (84)
    229 Bin number 9 bounds: (28.800001 - 32.000000) data (124)
    230 Bin number 10 bounds: (32.000000 - 35.200001) data (87)
     229Bin number 9 bounds: (28.800001 - 32.000000) data (93)
     230Bin number 10 bounds: (32.000000 - 35.200001) data (118)
    231231Bin number 11 bounds: (35.200001 - 38.400002) data (78)
    232232Bin number 12 bounds: (38.400002 - 41.600002) data (69)
    233233Bin number 13 bounds: (41.600002 - 44.799999) data (60)
    234 Bin number 14 bounds: (44.799999 - 48.000000) data (66)
    235 Bin number 15 bounds: (48.000000 - 51.200001) data (39)
     234Bin number 14 bounds: (44.799999 - 48.000000) data (51)
     235Bin number 15 bounds: (48.000000 - 51.200001) data (54)
    236236Bin number 16 bounds: (51.200001 - 54.400002) data (30)
    237237Bin number 17 bounds: (54.400002 - 57.600002) data (21)
    … …  
    251251Bin number 2 bounds: (6.400000 - 9.600000) data (27)
    252252Bin number 3 bounds: (9.600000 - 12.800000) data (36)
    253 Bin number 4 bounds: (12.800000 - 16.000000) data (62)
    254 Bin number 5 bounds: (16.000000 - 19.200001) data (57)
     253Bin number 4 bounds: (12.800000 - 16.000000) data (45)
     254Bin number 5 bounds: (16.000000 - 19.200001) data (74)
    255255Bin number 6 bounds: (19.200001 - 22.400000) data (66)
    256256Bin number 7 bounds: (22.400000 - 25.600000) data (75)
    257257Bin number 8 bounds: (25.600000 - 28.800001) data (84)
    258 Bin number 9 bounds: (28.800001 - 32.000000) data (124)
    259 Bin number 10 bounds: (32.000000 - 35.200001) data (84)
     258Bin number 9 bounds: (28.800001 - 32.000000) data (93)
     259Bin number 10 bounds: (32.000000 - 35.200001) data (115)
    260260Bin number 11 bounds: (35.200001 - 38.400002) data (66)
    261261Bin number 12 bounds: (38.400002 - 41.600002) data (48)
    … …  
    292292Bin number 2 bounds: (9.600000 - 14.400001) data (65)
    293293Bin number 3 bounds: (14.400001 - 19.200001) data (90)
    294 Bin number 4 bounds: (19.200001 - 24.000000) data (115)
    295 Bin number 5 bounds: (24.000000 - 28.800001) data (110)
     294Bin number 4 bounds: (19.200001 - 24.000000) data (90)
     295Bin number 5 bounds: (24.000000 - 28.800001) data (135)
    296296Bin number 6 bounds: (28.800001 - 33.600002) data (157)
    297297Bin number 7 bounds: (33.600002 - 38.400002) data (160)
    298298Bin number 8 bounds: (38.400002 - 43.200001) data (160)
    299 Bin number 9 bounds: (43.200001 - 48.000000) data (160)
    300 Bin number 10 bounds: (48.000000 - 52.800003) data (128)
     299Bin number 9 bounds: (43.200001 - 48.000000) data (128)
     300Bin number 10 bounds: (48.000000 - 52.800003) data (160)
    301301Bin number 11 bounds: (52.800003 - 57.600002) data (160)
    302302Bin number 12 bounds: (57.600002 - 62.400002) data (160)
    303303Bin number 13 bounds: (62.400002 - 67.200005) data (150)
    304 Bin number 14 bounds: (67.200005 - 72.000000) data (125)
    305 Bin number 15 bounds: (72.000000 - 76.800003) data (82)
     304Bin number 14 bounds: (67.200005 - 72.000000) data (102)
     305Bin number 15 bounds: (72.000000 - 76.800003) data (105)
    306306Bin number 16 bounds: (76.800003 - 81.600006) data (80)
    307307Bin number 17 bounds: (81.600006 - 86.400002) data (55)
    … …  
    321321Bin number 2 bounds: (9.600000 - 14.400001) data (65)
    322322Bin number 3 bounds: (14.400001 - 19.200001) data (90)
    323 Bin number 4 bounds: (19.200001 - 24.000000) data (115)
    324 Bin number 5 bounds: (24.000000 - 28.800001) data (110)
     323Bin number 4 bounds: (19.200001 - 24.000000) data (90)
     324Bin number 5 bounds: (24.000000 - 28.800001) data (135)
    325325Bin number 6 bounds: (28.800001 - 33.600002) data (157)
    326326Bin number 7 bounds: (33.600002 - 38.400002) data (160)
    327327Bin number 8 bounds: (38.400002 - 43.200001) data (160)
    328 Bin number 9 bounds: (43.200001 - 48.000000) data (160)
    329 Bin number 10 bounds: (48.000000 - 52.800003) data (122)
     328Bin number 9 bounds: (43.200001 - 48.000000) data (128)
     329Bin number 10 bounds: (48.000000 - 52.800003) data (154)
    330330Bin number 11 bounds: (52.800003 - 57.600002) data (130)
    331331Bin number 12 bounds: (57.600002 - 62.400002) data (105)
    332332Bin number 13 bounds: (62.400002 - 67.200005) data (76)
    333 Bin number 14 bounds: (67.200005 - 72.000000) data (50)
    334 Bin number 15 bounds: (72.000000 - 76.800003) data (22)
     333Bin number 14 bounds: (67.200005 - 72.000000) data (42)
     334Bin number 15 bounds: (72.000000 - 76.800003) data (30)
    335335Bin number 16 bounds: (76.800003 - 81.600006) data (6)
    336336Bin number 17 bounds: (81.600006 - 86.400002) data (0)
    … …  
    362362Bin number 2 bounds: (9.600000 - 14.400001) data (65)
    363363Bin number 3 bounds: (14.400001 - 19.200001) data (90)
    364 Bin number 4 bounds: (19.200001 - 24.000000) data (115)
    365 Bin number 5 bounds: (24.000000 - 28.800001) data (110)
     364Bin number 4 bounds: (19.200001 - 24.000000) data (90)
     365Bin number 5 bounds: (24.000000 - 28.800001) data (135)
    366366Bin number 6 bounds: (28.800001 - 33.600002) data (157)
    367367Bin number 7 bounds: (33.600002 - 38.400002) data (160)
    368368Bin number 8 bounds: (38.400002 - 43.200001) data (160)
    369 Bin number 9 bounds: (43.200001 - 48.000000) data (160)
    370 Bin number 10 bounds: (48.000000 - 52.800003) data (128)
     369Bin number 9 bounds: (43.200001 - 48.000000) data (128)
     370Bin number 10 bounds: (48.000000 - 52.800003) data (160)
    371371Bin number 11 bounds: (52.800003 - 57.600002) data (160)
    372372Bin number 12 bounds: (57.600002 - 62.400002) data (160)
    373373Bin number 13 bounds: (62.400002 - 67.200005) data (150)
    374 Bin number 14 bounds: (67.200005 - 72.000000) data (125)
    375 Bin number 15 bounds: (72.000000 - 76.800003) data (82)
     374Bin number 14 bounds: (67.200005 - 72.000000) data (102)
     375Bin number 15 bounds: (72.000000 - 76.800003) data (105)
    376376Bin number 16 bounds: (76.800003 - 81.600006) data (80)
    377377Bin number 17 bounds: (81.600006 - 86.400002) data (55)
    … …  
    391391Bin number 2 bounds: (9.600000 - 14.400001) data (65)
    392392Bin number 3 bounds: (14.400001 - 19.200001) data (90)
    393 Bin number 4 bounds: (19.200001 - 24.000000) data (115)
    394 Bin number 5 bounds: (24.000000 - 28.800001) data (110)
     393Bin number 4 bounds: (19.200001 - 24.000000) data (90)
     394Bin number 5 bounds: (24.000000 - 28.800001) data (135)
    395395Bin number 6 bounds: (28.800001 - 33.600002) data (157)
    396396Bin number 7 bounds: (33.600002 - 38.400002) data (160)
    397397Bin number 8 bounds: (38.400002 - 43.200001) data (160)
    398 Bin number 9 bounds: (43.200001 - 48.000000) data (160)
    399 Bin number 10 bounds: (48.000000 - 52.800003) data (122)
     398Bin number 9 bounds: (43.200001 - 48.000000) data (128)
     399Bin number 10 bounds: (48.000000 - 52.800003) data (154)
    400400Bin number 11 bounds: (52.800003 - 57.600002) data (130)
    401401Bin number 12 bounds: (57.600002 - 62.400002) data (105)
    402402Bin number 13 bounds: (62.400002 - 67.200005) data (76)
    403 Bin number 14 bounds: (67.200005 - 72.000000) data (50)
    404 Bin number 15 bounds: (72.000000 - 76.800003) data (22)
     403Bin number 14 bounds: (67.200005 - 72.000000) data (42)
     404Bin number 15 bounds: (72.000000 - 76.800003) data (30)
    405405Bin number 16 bounds: (76.800003 - 81.600006) data (6)
    406406Bin number 17 bounds: (81.600006 - 86.400002) data (0)
Note: See TracChangeset for help on using the changeset viewer.