Changeset 38

Timestamp:

03/17/08 09:59:16 (16 years ago)

Author:

peroutka

Message:

 

Files:

• CMakeLists.txt (modified) (1 diff)
• simulator_zdenek (added)
• simulator_zdenek/demo_example (added)
• simulator_zdenek/demo_example/_popis.txt (added)
• simulator_zdenek/demo_example/data (added)
• simulator_zdenek/demo_example/data/kresli_ladeni.m (added)
• simulator_zdenek/demo_example/main.CPP (added)
• simulator_zdenek/demo_example/nastaveni_regulatoru_float.h (added)
• simulator_zdenek/demo_example/regulace.CPP (added)
• simulator_zdenek/demo_example/regulace.h (added)
• simulator_zdenek/demo_example/simulator.cpp (added)
• simulator_zdenek/demo_example/simulator.h (added)
• simulator_zdenek/nastaveni_regulatoru_float.h (added)
• simulator_zdenek/regulace.CPP (added)
• simulator_zdenek/regulace.h (added)
• simulator_zdenek/simulator.cpp (added)
• simulator_zdenek/simulator.h (added)
• win32/itpp-4.0.1/itpp/config.h (modified) (12 diffs)
• win32/run_cmake.bat (modified) (1 diff)

CMakeLists.txt

@@ -16 +16 @@
 # THEN IT IS NECESSARY TO CREATE TEXT FILE "\WIN32\LOCAL_PATHS.TXT" WITH 
 # COPIES OF THE TWO FOLLOWING LINES AND THEN CORECT BOTH INVOLVED PATHS
-        SET(ITPP_DIR ".\\win32\\itpp-4.0.1")
-        SET(ACML_DIR ".\\win32\\acml3.6.0")
+        SET(ITPP_DIR "${BDM_SOURCE_DIR}\\win32\\itpp-4.0.1")
+        SET(ACML_DIR "${BDM_SOURCE_DIR}\\win32\\acml3.6.0")
 
         INCLUDE(\\win32\\local_paths.txt OPTIONAL)      

win32/itpp-4.0.1/itpp/config.h

@@ -15 +15 @@
 
 /* Define to 1 if you have the `acosh' function. */
-#define HAVE_ACOSH 1
+/* #undef HAVE_ACOSH */
 
 /* Define to 1 if you have the `asinh' function. */
-#define HAVE_ASINH 1
+/* #undef HAVE_ASINH */
 
 /* Define to 1 if you have the `atanh' function. */
-#define HAVE_ATANH 1
-
+/* #undef HAVE_ATANH */
+
+#if defined(HAVE_ACML) || defined(HAVE_MKL)
 /* Define if you have a BLAS library. */
-#define HAVE_BLAS 1
-
+#  define HAVE_BLAS 1
+#endif
+
+#ifdef HAVE_ACML
 /* Define if you have an ACML BLAS library. */
-/* #undef HAVE_BLAS_ACML */
+#  define HAVE_BLAS_ACML 1
+#endif
 
 /* Define if you have an ATLAS BLAS library. */
-#define HAVE_BLAS_ATLAS 1
-
+/* #undef HAVE_BLAS_ATLAS */
+
+#ifdef HAVE_MKL
 /* Define if you have an MKL BLAS library. */
-/* #undef HAVE_BLAS_MKL */
+#  define HAVE_BLAS_MKL 1
+#endif
 
 /* Define to 1 if you have the `cbrt' function. */
-#define HAVE_CBRT 1
+/* #undef HAVE_CBRT */
 
 /* Define to 1 if you have the <cmath> header file. */
@@ -50 +56 @@
 /* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
    */
-#define HAVE_DECL_ISINF 1
+#define HAVE_DECL_ISINF 0
 
 /* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
    */
-#define HAVE_DECL_ISNAN 1
+#define HAVE_DECL_ISNAN 0
 
 /* Define to 1 if you have the declaration of `signgam', and to 0 if you
    don't. */
-#define HAVE_DECL_SIGNGAM 1
+#define HAVE_DECL_SIGNGAM 0
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
@@ -64 +70 @@
 
 /* Define to 1 if you have the `erf' function. */
-#define HAVE_ERF 1
+/* #undef HAVE_ERF */
 
 /* Define to 1 if you have the `erfc' function. */
-#define HAVE_ERFC 1
+/* #undef HAVE_ERFC */
 
 /* Define if the compiler supports extern template */
-#define HAVE_EXTERN_TEMPLATE 1
-
+/* #undef HAVE_EXTERN_TEMPLATE */
+
+#if defined(HAVE_ACML) || defined(HAVE_MKL)
 /* Define if you have FFT library. */
-/* #undef HAVE_FFT */
+#  define HAVE_FFT 1
+#endif
 
 /* Define if you have FFTW3 library. */
 /* #undef HAVE_FFTW3 */
 
+#ifdef HAVE_ACML
 /* Define if you have ACML FFT library. */
-/* #undef HAVE_FFT_ACML */
-
+#  define HAVE_FFT_ACML 1
+#endif
+
+#ifdef HAVE_MKL
 /* Define if you have MKL FFT library. */
-/* #undef HAVE_FFT_MKL */
+#  define HAVE_FFT_MKL 1
+#endif
 
 /* Define to 1 if you have the `finite' function. */
-#define HAVE_FINITE 1
+/* #undef HAVE_FINITE */
 
 /* Define to 1 if you have the `fpclass' function. */
@@ -94 +106 @@
 
 /* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
+/* #undef HAVE_INTTYPES_H */
 
 /* Define to 1 if you have the `isfinite' function. */
@@ -100 +112 @@
 
 /* Define to 1 if you have the `isinf' function. */
-#define HAVE_ISINF 1
+/* #undef HAVE_ISINF */
 
 /* Define to 1 if you have the `isnan' function. */
-#define HAVE_ISNAN 1
-
+/* #undef HAVE_ISNAN */
+
+#if defined(HAVE_ACML) || defined(HAVE_MKL)
 /* Define if you have LAPACK library. */
-#define HAVE_LAPACK 1
+#  define HAVE_LAPACK 1
+#endif
 
 /* Define to 1 if you have the `lgamma' function. */
-#define HAVE_LGAMMA 1
+/* #undef HAVE_LGAMMA */
 
 /* Define to 1 if you have the `log1p' function. */
-#define HAVE_LOG1P 1
+/* #undef HAVE_LOG1P */
 
 /* Define to 1 if you have the `log2' function. */
-#define HAVE_LOG2 1
+/* #undef HAVE_LOG2 */
 
 /* Define to 1 if you have the <memory.h> header file. */
@@ -121 +135 @@
 
 /* Define to 1 if you have the `rint' function. */
-#define HAVE_RINT 1
+/* #undef HAVE_RINT */
 
 /* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
+/* #undef HAVE_STDINT_H */
 
 /* Define to 1 if you have the <stdlib.h> header file. */
@@ -130 +144 @@
 
 /* Define to 1 if you have the `std::isfinite' function. */
-#define HAVE_STD_ISFINITE 1
+/* #undef HAVE_STD_ISFINITE */
 
 /* Define to 1 if you have the `std::isinf' function. */
-#define HAVE_STD_ISINF 1
+/* #undef HAVE_STD_ISINF */
 
 /* Define to 1 if you have the `std::isnan' function. */
-#define HAVE_STD_ISNAN 1
+/* #undef HAVE_STD_ISNAN */
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -151 +165 @@
 
 /* Define to 1 if you have the `tgamma' function. */
-#define HAVE_TGAMMA 1
+/* #undef HAVE_TGAMMA */
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
-/* Define to use zdotusub_ Fortran wrapper. */
-#define HAVE_ZDOTUSUB 1
-
-/* Define to use "void zdotu_()". */
-/* #undef HAVE_ZDOTU_VOID */
+/* Define if zdotu_ can return result like a function. */
+/* #undef HAVE_ZDOTU_RETURN */
+
+/* Define if zdotu_ can pass result as its first argument. */
+#define HAVE_ZDOTU_VOID 1
 
 /* Define if you want exceptions handling */
@@ -175 +189 @@
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "IT++ 4.1.r1469"
+#define PACKAGE_STRING "IT++ 4.0.0"
 
 /* Define to the one symbol short name of this package. */
@@ -181 +195 @@
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.1.r1469"
+#define PACKAGE_VERSION "4.0.0"
 
 /* The size of `int', as computed by sizeof. */
@@ -211 +225 @@
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
+/* #undef TIME_WITH_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "4.1.r1469"
+#define VERSION "4.0.0"
 
 
@@ -251 +265 @@
 /* IT++ uses only std::min() and std::max() functions, not macros */
 #ifdef min
-/* #  undef min */
+#  undef min
 #endif
 #ifdef max
-/* #  undef max */
+#  undef max
 #endif
 

win32/run_cmake.bat

@@ -1 +1 @@
 @echo off
 cd ..
-cmake -G "Visual Studio 8 2005"
+"c:\Program Files\CMake 2.4\bin\cmake.exe" -G "Borland Makefiles"
 pause