diff --git a/projects/VC7.1/Array/Array.vcproj b/projects/VC7.1/Array/Array.vcproj index e2a99cda..a6f92160 100644 --- a/projects/VC7.1/Array/Array.vcproj +++ b/projects/VC7.1/Array/Array.vcproj @@ -61,8 +61,8 @@ CharacterSet="2"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/VC7.1/gpc232/gpc232.vcproj b/projects/VC7.1/gpc232/gpc232.vcproj index 075923c7..86c8771b 100644 --- a/projects/VC7.1/gpc232/gpc232.vcproj +++ b/projects/VC7.1/gpc232/gpc232.vcproj @@ -60,7 +60,8 @@ + RelativePath="..\..\..\..\newmat\bandmat.cpp"> + RelativePath="..\..\..\..\newmat\cholesky.cpp"> + RelativePath="..\..\..\..\newmat\evalue.cpp"> + RelativePath="..\..\..\..\newmat\fft.cpp"> + RelativePath="..\..\..\..\newmat\hholder.cpp"> + RelativePath="..\..\..\..\newmat\jacobi.cpp"> + RelativePath="..\..\..\..\newmat\myexcept.cpp"> + RelativePath="..\..\..\..\newmat\newfft.cpp"> + RelativePath="..\..\..\..\newmat\newmat1.cpp"> + RelativePath="..\..\..\..\newmat\newmat2.cpp"> + RelativePath="..\..\..\..\newmat\newmat3.cpp"> + RelativePath="..\..\..\..\newmat\newmat4.cpp"> + RelativePath="..\..\..\..\newmat\newmat5.cpp"> + RelativePath="..\..\..\..\newmat\newmat6.cpp"> + RelativePath="..\..\..\..\newmat\newmat7.cpp"> + RelativePath="..\..\..\..\newmat\newmat8.cpp"> + RelativePath="..\..\..\..\newmat\newmat9.cpp"> + RelativePath="..\..\..\..\newmat\newmatex.cpp"> + RelativePath="..\..\..\..\newmat\newmatrm.cpp"> + RelativePath="..\..\..\..\newmat\nm_misc.cpp"> + RelativePath="..\..\..\..\newmat\sort.cpp"> + RelativePath="..\..\..\..\newmat\submat.cpp"> + RelativePath="..\..\..\..\newmat\svd.cpp"> + RelativePath="..\..\..\..\newmat\myexcept.h"> + RelativePath="..\..\..\..\newmat\newmat.h"> + RelativePath="..\..\..\..\newmat\newmatap.h"> + RelativePath="..\..\..\..\newmat\newmatio.h"> + RelativePath="..\..\..\..\newmat\newmatrm.h"> cols() * Pts->rows(); // number of observations int npred = 15; // number of predictor values A[n] - Real tz[nobs]; - Real t1[nobs]; - Real t2[nobs]; - Real t3[nobs]; - Real t4[nobs]; - Real t5[nobs]; - Real t6[nobs]; - Real t7[nobs]; - Real t8[nobs]; - Real t9[nobs]; - Real t10[nobs]; - Real t11[nobs]; - Real t12[nobs]; - Real t13[nobs]; - Real t14[nobs]; - Real t15[nobs]; + vector tz(nobs); + vector t1(nobs); + vector t2(nobs); + vector t3(nobs); + vector t4(nobs); + vector t5(nobs); + vector t6(nobs); + vector t7(nobs); + vector t8(nobs); + vector t9(nobs); + vector t10(nobs); + vector t11(nobs); + vector t12(nobs); + vector t13(nobs); + vector t14(nobs); + vector t15(nobs); // generate the required fit data for ( int j = 0; j < Pts->rows(); j++ ) { @@ -430,9 +430,9 @@ void TGAptSurface::fit() { Try { surface_coefficients - = qr_method( tz, - t1, t2, t3, t4, t5, t6, t7, t8, - t9, t10, t11, t12, t13, t14, t15, + = qr_method( &tz[0], + &t1[0], &t2[0], &t3[0], &t4[0], &t5[0], &t6[0], &t7[0], &t8[0], + &t9[0], &t10[0], &t11[0], &t12[0], &t13[0], &t14[0], &t15[0], nobs, npred ); cout << "surface_coefficients size = " << surface_coefficients.nrows() << endl; diff --git a/src/Airports/GenAirports/main.cxx b/src/Airports/GenAirports/main.cxx index 189542c1..2036fb38 100644 --- a/src/Airports/GenAirports/main.cxx +++ b/src/Airports/GenAirports/main.cxx @@ -28,6 +28,7 @@ #include #include +#include #ifdef HAVE_STDLIB_H #include @@ -53,10 +54,6 @@ #include "build.hxx" #include "convex_hull.hxx" -#ifdef _MSC_VER -# include -#endif - using std::vector; using std::cout; using std::endl; @@ -226,12 +223,9 @@ int main( int argc, char **argv ) { // make work directory string airportareadir=work_dir+"/AirportArea"; -#ifdef _MSC_VER - fg_mkdir( airportareadir.c_str() ); -#else - string command = "mkdir -p " + airportareadir; - system( command.c_str() ); -#endif + SGPath sgp( airportareadir ); + sgp.append( "dummy" ); + sgp.create_dir( 0755 ); // initialize persistant polygon counter string counter_file = airportareadir+"/poly_counter";