C++ - ified comments. Make file open errors fatal.
This commit is contained in:
parent
98f398c99a
commit
7b2370d608
2 changed files with 41 additions and 38 deletions
|
@ -46,7 +46,7 @@ fgINTERPTABLE::fgINTERPTABLE( char *file ) {
|
||||||
if ( (fd = gzopen(gzfile, "r")) == NULL ) {
|
if ( (fd = gzopen(gzfile, "r")) == NULL ) {
|
||||||
// Next try "path"
|
// Next try "path"
|
||||||
if ( (fd = gzopen(file, "r")) == NULL ) {
|
if ( (fd = gzopen(file, "r")) == NULL ) {
|
||||||
fgPrintf(FG_MATH, FG_ALERT, "Cannot open file: %s\n", file);
|
fgPrintf(FG_MATH, FG_EXIT, "Cannot open file: %s\n", file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ fgINTERPTABLE::fgINTERPTABLE( char *file ) {
|
||||||
sscanf(line, "%lf %lf\n", &(table[size][0]), &(table[size][1]));
|
sscanf(line, "%lf %lf\n", &(table[size][0]), &(table[size][1]));
|
||||||
size++;
|
size++;
|
||||||
} else {
|
} else {
|
||||||
fgPrintf( FG_MATH, FG_ALERT,
|
fgPrintf( FG_MATH, FG_EXIT,
|
||||||
"fgInterpolateInit(): Exceed max table size = %d\n",
|
"fgInterpolateInit(): Exceed max table size = %d\n",
|
||||||
MAX_TABLE_SIZE );
|
MAX_TABLE_SIZE );
|
||||||
}
|
}
|
||||||
|
@ -77,7 +77,7 @@ double fgINTERPTABLE::interpolate(double x) {
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf ("i = %d ", i);
|
// printf ("i = %d ", i);
|
||||||
|
|
||||||
if ( (i == 0) && (x < table[0][0]) ) {
|
if ( (i == 0) && (x < table[0][0]) ) {
|
||||||
fgPrintf( FG_MATH, FG_ALERT,
|
fgPrintf( FG_MATH, FG_ALERT,
|
||||||
|
@ -107,10 +107,12 @@ fgINTERPTABLE::~fgINTERPTABLE( void ) {
|
||||||
|
|
||||||
|
|
||||||
// $Log$
|
// $Log$
|
||||||
|
// Revision 1.2 1998/04/22 13:18:10 curt
|
||||||
|
// C++ - ified comments. Make file open errors fatal.
|
||||||
|
//
|
||||||
// Revision 1.1 1998/04/21 19:14:23 curt
|
// Revision 1.1 1998/04/21 19:14:23 curt
|
||||||
// Modified Files:
|
// Modified Files:
|
||||||
// Makefile.am Makefile.in
|
// Makefile.am Makefile.in
|
||||||
// Added Files:
|
// Added Files:
|
||||||
// interpolater.cxx interpolater.hxx
|
// interpolater.cxx interpolater.hxx
|
||||||
//
|
//
|
||||||
//
|
|
||||||
|
|
|
@ -1,28 +1,27 @@
|
||||||
/**************************************************************************
|
//
|
||||||
* interpolater.hxx -- routines to handle linear interpolation from a table of
|
// interpolater.hxx -- routines to handle linear interpolation from a table of
|
||||||
* x,y The table must be sorted by "x" in ascending order
|
// x,y The table must be sorted by "x" in ascending order
|
||||||
*
|
//
|
||||||
* Written by Curtis Olson, started April 1998.
|
// Written by Curtis Olson, started April 1998.
|
||||||
*
|
//
|
||||||
* Copyright (C) 1998 Curtis L. Olson - curt@me.umn.edu
|
// Copyright (C) 1998 Curtis L. Olson - curt@me.umn.edu
|
||||||
*
|
//
|
||||||
* This program is free software; you can redistribute it and/or
|
// This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License as
|
// modify it under the terms of the GNU General Public License as
|
||||||
* published by the Free Software Foundation; either version 2 of the
|
// published by the Free Software Foundation; either version 2 of the
|
||||||
* License, or (at your option) any later version.
|
// License, or (at your option) any later version.
|
||||||
*
|
//
|
||||||
* This program is distributed in the hope that it will be useful, but
|
// This program is distributed in the hope that it will be useful, but
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* General Public License for more details.
|
// General Public License for more details.
|
||||||
*
|
//
|
||||||
* You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
// along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*
|
//
|
||||||
* $Id$
|
// $Id$
|
||||||
* (Log is kept at end of this file)
|
// (Log is kept at end of this file)
|
||||||
**************************************************************************/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef _INTERPOLATER_H
|
#ifndef _INTERPOLATER_H
|
||||||
|
@ -55,14 +54,16 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif /* _INTERPOLATER_H */
|
#endif // _INTERPOLATER_H
|
||||||
|
|
||||||
|
|
||||||
/* $Log$
|
// $Log$
|
||||||
/* Revision 1.1 1998/04/21 19:14:23 curt
|
// Revision 1.2 1998/04/22 13:18:10 curt
|
||||||
/* Modified Files:
|
// C++ - ified comments. Make file open errors fatal.
|
||||||
/* Makefile.am Makefile.in
|
//
|
||||||
/* Added Files:
|
// Revision 1.1 1998/04/21 19:14:23 curt
|
||||||
/* interpolater.cxx interpolater.hxx
|
// Modified Files:
|
||||||
/*
|
// Makefile.am Makefile.in
|
||||||
*/
|
// Added Files:
|
||||||
|
// interpolater.cxx interpolater.hxx
|
||||||
|
//
|
||||||
|
|
Loading…
Reference in a new issue