Changeset 682 in Sophya for trunk/SophyaLib/NTools


Ignore:
Timestamp:
Dec 10, 1999, 5:56:03 PM (26 years ago)
Author:
ansari
Message:

Compilation Mac pour CodeWarrior PRO 5

Location:
trunk/SophyaLib/NTools
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaLib/NTools/datime.c

    r517 r682  
    66#include <math.h>
    77#ifdef __MWERKS__
    8    #include "mwerksmath.h"
    9 //   #include "unixmac.h"
     8#include "unixmac.h"
    109#endif
    1110

  • trunk/SophyaLib/NTools/generalfit.cc

    r519 r682  
    55#include <math.h>
    66#ifdef __MWERKS__
    7    #include "mwerksmath.h"
    8  //  #include "unixmac.h"
     7#include "unixmac.h"
    98#endif
    109#include <string.h>

  • trunk/SophyaLib/NTools/histos.cc

    r514 r682  
    11//
    2 // $Id: histos.cc,v 1.6 1999-10-25 16:39:57 ansari Exp $
     2// $Id: histos.cc,v 1.7 1999-12-10 16:55:51 ansari Exp $
    33//
    44
    … …  
    17811781
    17821782// Que faut-il ecrire?
    1783 int errok = (dobj->err2) ? 1 : 0;
     1783int_4 errok = (dobj->err2) ? 1 : 0;
    17841784
    17851785// Ecriture entete pour identifier facilement

  • trunk/SophyaLib/NTools/matxop.c

    r220 r682  
    393393if (szv < 25) szv = 25;
    394394
    395 if ( (FVeci = malloc(nvarmx*sizeof(float *))) == NULL )
     395if ( (FVeci = (float**) malloc(nvarmx*sizeof(float *))) == NULL )
    396396  { printf("InitRFitLin_Erreur: (Pb malloc(Veci)) \n");
    397397  return(1);
    398398  }
    399399
    400 if ( (FVSpace = malloc(nvarmx*szv*sizeof(float))) == NULL )
     400if ( (FVSpace = (float*)  malloc(nvarmx*szv*sizeof(float))) == NULL )
    401401  { printf("InitRFitLin_Erreur: (Pb malloc(VSpace)) \n");
    402402  free(FVeci);
    … …  
    407407
    408408
    409 if ( (FVecf = malloc(3*sizeof(float *))) == NULL )
     409if ( (FVecf = (float**) malloc(3*sizeof(float *))) == NULL )
    410410  { printf("InitRFitLin_Erreur: (Pb malloc(Vecf)) \n");
    411411  free(FVeci);
    … …  
    414414  }
    415415
    416 if ( (FVSpacef = malloc(3*szv*sizeof(float))) == NULL )
     416if ( (FVSpacef = (float*) malloc(3*szv*sizeof(float))) == NULL )
    417417  { printf("InitRFitLin_Erreur: (Pb malloc(VSpacef)) \n");
    418418  free(FVeci);
    … …  
    425425
    426426
    427 if ( (FFMtx = malloc(nvarmx*nvarmx*sizeof(double))) == NULL )
     427if ( (FFMtx = (double*) malloc(nvarmx*nvarmx*sizeof(double))) == NULL )
    428428  { printf("InitRFitLin_Erreur: (Pb malloc(FMtx)) \n");
    429429  free(FVeci);
    … …  
    434434  }
    435435
    436 if ( (FFMtx2 = malloc(nvarmx*nvarmx*sizeof(double))) == NULL )
     436if ( (FFMtx2 = (double*) malloc(nvarmx*nvarmx*sizeof(double))) == NULL )
    437437  { printf("InitRFitLin_Erreur: (Pb malloc(FMtx2)) \n");
    438438  free(FVeci);
    … …  
    444444  }
    445445
    446 if ( (FFSort = malloc((nvarmx+1)*nvarmx*sizeof(double))) == NULL )
     446if ( (FFSort = (double*) malloc((nvarmx+1)*nvarmx*sizeof(double))) == NULL )
    447447  { printf("InitRFitLin_Erreur: (Pb malloc(FFSort)) \n");
    448448  free(FVeci);
    … …  
    705705if (szv < 25) szv = 25;
    706706
    707 if ( (DVeci = malloc(nvarmx*sizeof(double *))) == NULL )
     707if ( (DVeci = (double**) malloc(nvarmx*sizeof(double *))) == NULL )
    708708  { printf("InitDFitLin_Erreur: (Pb malloc(Veci)) \n");
    709709  return(1);
    710710  }
    711711
    712 if ( (DVSpace = malloc(nvarmx*szv*sizeof(double))) == NULL )
     712if ( (DVSpace = (double*) malloc(nvarmx*szv*sizeof(double))) == NULL )
    713713  { printf("InitDFitLin_Erreur: (Pb malloc(VSpace)) \n");
    714714  free(DVeci);
    … …  
    719719
    720720
    721 if ( (DVecf = malloc(3*sizeof(double *))) == NULL )
     721if ( (DVecf = (double**) malloc(3*sizeof(double *))) == NULL )
    722722  { printf("InitDFitLin_Erreur: (Pb malloc(Vecf)) \n");
    723723  free(DVeci);
    … …  
    726726  }
    727727
    728 if ( (DVSpacef = malloc(3*szv*sizeof(double))) == NULL )
     728if ( (DVSpacef = (double*) malloc(3*szv*sizeof(double))) == NULL )
    729729  { printf("InitDFitLin_Erreur: (Pb malloc(VSpacef)) \n");
    730730  free(DVeci);
    … …  
    737737
    738738
    739 if ( (DFMtx = malloc(nvarmx*nvarmx*sizeof(double))) == NULL )
     739if ( (DFMtx = (double*) malloc(nvarmx*nvarmx*sizeof(double))) == NULL )
    740740  { printf("InitDFitLin_Erreur: (Pb malloc(FMtx)) \n");
    741741  free(DVeci);
    … …  
    746746  }
    747747
    748 if ( (DFMtx2 = malloc(nvarmx*nvarmx*sizeof(double))) == NULL )
     748if ( (DFMtx2 = (double*) malloc(nvarmx*nvarmx*sizeof(double))) == NULL )
    749749  { printf("InitDFitLin_Erreur: (Pb malloc(FMtx2)) \n");
    750750  free(DVeci);

  • trunk/SophyaLib/NTools/nbmath.c

    r220 r682  
    16431643{
    16441644int npt,k,i,nclass;
    1645 double *class,aa1,c2,cut;
     1645double *clas,aa1,c2,cut;
    16461646
    16471647*a1 =0.;
    … …  
    16541654/* printf("pass 1: %g*x c2=%g/%d\n",*a1,c2,npt); */
    16551655
    1656 class = malloc( *n * sizeof(double) );
    1657 if( class == NULL ) {*n=npt; return(-3.);}
     1656clas = (double*) malloc( *n * sizeof(double) );
     1657if( clas == NULL ) {*n=npt; return(-3.);}
    16581658
    16591659/* elimination des mauvais points */
    … …  
    16621662  if(ey[i]<=0.) continue;
    16631663  c2 = (y[i]-aa1*x[i])/ey[i];
    1664   class[nclass] = c2*c2;
     1664  clas[nclass] = c2*c2;
    16651665  nclass++;
    16661666}
    1667 qsort(class,(size_t) nclass,(size_t) sizeof(double),qSort_Dble);
     1667qsort(clas,(size_t) nclass,(size_t) sizeof(double),qSort_Dble);
    16681668k = (int) ( (1. - per_clean ) * (double) nclass );
    16691669if(k<0) k=0;
    16701670if(k>=nclass) k = nclass-1;
    1671 cut = class[k];
     1671cut = clas[k];
    16721672k = 0;
    16731673for(i=0;i<*n;i++) {
    1674   class[i] = ey[i];
     1674  clas[i] = ey[i];
    16751675  c2 = (y[i]-aa1*x[i])/ey[i];
    16761676  c2 *= c2;
    1677   if(ey[i]>0. && c2>cut) {class[i] = -1.; k++;}
     1677  if(ey[i]>0. && c2>cut) {clas[i] = -1.; k++;}
    16781678}
    16791679/* printf("nombre pt tues %d cut=%g\n",k,cut); */
    … …  
    16811681/* 2sd passe */
    16821682npt = *n;
    1683 c2 = FitProp(x,y,class,&npt,&aa1);
    1684 if(c2<0.) {*n = npt; free(class); return(-2.);}
     1683c2 = FitProp(x,y,clas,&npt,&aa1);
     1684if(c2<0.) {*n = npt; free(clas); return(-2.);}
    16851685*a1 = aa1;
    16861686*n = npt;
    16871687/* printf("pass 2: %g*x c2=%g/%d\n",*a1,c2,npt); */
    16881688
    1689 free(class);
     1689free(clas);
    16901690return(c2);
    16911691}
    … …  
    17301730{
    17311731int npt,k,i,nclass;
    1732 double *class,aa0,aa1,c2,cut;
     1732double *clas,aa0,aa1,c2,cut;
    17331733
    17341734*a0 = *a1 =0.;
    … …  
    17421742/* printf("pass 1: %g + %g*x c2=%g/%d\n",*a0,*a1,c2,npt); */
    17431743
    1744 class = malloc( *n * sizeof(double) );
    1745 if( class == NULL ) {*n=npt; return(-3.);}
     1744clas = (double*) malloc( *n * sizeof(double) );
     1745if( clas == NULL ) {*n=npt; return(-3.);}
    17461746
    17471747/* elimination des mauvais points */
    … …  
    17501750  if(ey[i]<=0.) continue;
    17511751  c2 = (y[i]-(aa0+aa1*x[i]))/ey[i];
    1752   class[nclass] = c2*c2;
     1752  clas[nclass] = c2*c2;
    17531753  nclass++;
    17541754}
    1755 qsort(class,(size_t) nclass,(size_t) sizeof(double),qSort_Dble);
     1755qsort(clas,(size_t) nclass,(size_t) sizeof(double),qSort_Dble);
    17561756k = (int) ( (1. - per_clean ) * (double) nclass );
    17571757if(k<0) k=0;
    17581758if(k>=nclass) k = nclass-1;
    1759 cut = class[k];
     1759cut = clas[k];
    17601760k = 0;
    17611761for(i=0;i<*n;i++) {
    1762   class[i] = ey[i];
     1762  clas[i] = ey[i];
    17631763  c2 = (y[i]-(aa0+aa1*x[i]))/ey[i];
    17641764  c2 *= c2;
    1765   if(ey[i]>0. && c2>cut) {class[i] = -1.; k++;}
     1765  if(ey[i]>0. && c2>cut) {clas[i] = -1.; k++;}
    17661766}
    17671767/* printf("nombre pt tues %d cut=%g\n",k,cut); */
    … …  
    17691769/* 2sd passe */
    17701770npt = *n;
    1771 c2 = FitLin(x,y,class,&npt,&aa0,&aa1);
    1772 if(c2<0.) {*n = npt; free(class); return(-2.);}
     1771c2 = FitLin(x,y,clas,&npt,&aa0,&aa1);
     1772if(c2<0.) {*n = npt; free(clas); return(-2.);}
    17731773*a0 = aa0;
    17741774*a1 = aa1;
    … …  
    17761776/* printf("pass 2: %g + %g*x c2=%g/%d\n",*a0,*a1,c2,npt); */
    17771777
    1778 free(class);
     1778free(clas);
    17791779return(c2);
    17801780}
    … …  
    18151815{
    18161816int npt,k,i,nclass;
    1817 double *class,aa0,aa1,aa2,c2,cut;
     1817double *clas,aa0,aa1,aa2,c2,cut;
    18181818
    18191819*a0 = *a1 = *a2 =0.;
    … …  
    18281828/* printf("pass 1: %g + %g*x + %g*x**2 c2=%g/%d\n",*a0,*a1,*a2,c2,npt); */
    18291829
    1830 class = malloc( *n * sizeof(double) );
    1831 if( class == NULL ) {*n=npt; return(-3.);}
     1830clas = (double*) malloc( *n * sizeof(double) );
     1831if( clas == NULL ) {*n=npt; return(-3.);}
    18321832
    18331833/* elimination des mauvais points */
    … …  
    18361836  if(ey[i]<=0.) continue;
    18371837  c2 = (y[i]-(aa0+aa1*x[i]+aa2*x[i]*x[i]))/ey[i];
    1838   class[nclass] = c2*c2;
     1838  clas[nclass] = c2*c2;
    18391839  nclass++;
    18401840}
    1841 qsort(class,(size_t) nclass,(size_t) sizeof(double),qSort_Dble);
     1841qsort(clas,(size_t) nclass,(size_t) sizeof(double),qSort_Dble);
    18421842k = (int) ( (1. - per_clean ) * (double) nclass );
    18431843if(k<0) k=0;
    18441844if(k>=nclass) k = nclass-1;
    1845 cut = class[k];
     1845cut = clas[k];
    18461846k = 0;
    18471847for(i=0;i<*n;i++) {
    1848   class[i] = ey[i];
     1848  clas[i] = ey[i];
    18491849  c2 = (y[i]-(aa0+aa1*x[i]+aa2*x[i]*x[i]))/ey[i];
    18501850  c2 *= c2;
    1851   if(ey[i]>0. && c2>cut) {class[i] = -1.; k++;}
     1851  if(ey[i]>0. && c2>cut) {clas[i] = -1.; k++;}
    18521852}
    18531853/* printf("nombre pt tues %d cut=%g\n",k,cut); */
    … …  
    18551855/* 2sd passe */
    18561856npt = *n;
    1857 c2 = FitPar(x,y,class,&npt,&aa0,&aa1,&aa2);
    1858 if(c2<0.) {*n = npt; free(class); return(-2.);}
     1857c2 = FitPar(x,y,clas,&npt,&aa0,&aa1,&aa2);
     1858if(c2<0.) {*n = npt; free(clas); return(-2.);}
    18591859*a0 = aa0;
    18601860*a1 = aa1;
    … …  
    18631863/* printf("pass 2: %g + %g*x + %g*x**2 c2=%g/%d\n",*a0,*a1,*a2,c2,npt); */
    18641864
    1865 free(class);
     1865free(clas);
    18661866return(c2);
    18671867}

  • trunk/SophyaLib/NTools/nbrandom.c

    r244 r682  
    495495
    496496sof = sizeof(struct tirage_alea);
    497 if( (t = malloc(sof) ) == NULL ) {
     497if( (t = (struct tirage_alea*)malloc(sof) ) == NULL ) {
    498498  printf("impossible d'allouer *tirage_alea par malloc \n");
    499499  return(NULL);
    … …  
    503503
    504504sof = nbin * sizeof(double);
    505 if( (t->Tab = malloc(sof) ) == NULL ) {
     505if( (t->Tab = (double*)malloc(sof) ) == NULL ) {
    506506  printf("impossible d'allouer *tirage_alea.Tab par malloc \n");
    507507  return(NULL);

  • trunk/SophyaLib/NTools/nbrandom.h

    r517 r682  
    88#include <stdlib.h>
    99#ifdef __MWERKS__
    10    #include "mwerksmath.h"
    11    #include "unixmac.h"
     10#include "unixmac.h"
    1211#endif
    1312
Note: See TracChangeset for help on using the changeset viewer.