Commit 24e5ef84 authored by Houtan Bastani's avatar Houtan Bastani
Browse files

moved matrix.h to swzmatrix.h because of conflict with matrix.h provided by Matlab

parent 08dece96
......@@ -201,7 +201,7 @@ VAR_DIR = $(WORK_DIR)/sbvar/var
# DW FILES
INCLUDE_DIR := -I$(MATRIX_DIR) -I$(ERROR_DIR) -I$(ARRAY_DIR) -I$(ASCII_DIR) -I$(STAT_DIR) -I$(SPHERICAL_DIR) -I$(SORT_DIR) -I$(SWITCH_DIR) -I$(VAR_DIR) $(INCLUDE_DIR)
VPATH := $(VPATH) $(MATRIX_DIR) $(ERROR_DIR) $(ARRAY_DIR) $(ASCII_DIR) $(STAT_DIR) $(SPHERICAL_DIR) $(SORT_DIR) $(SWITCH_DIR) $(VAR_DIR)
OBJS := $(OBJS) bmatrix.o matrix.o dw_error.o dw_rand.o dw_matrix_rand.o dw_array.o dw_matrix_array.o dw_matrix_sort.o dw_ascii.o dw_parse_cmd.o
OBJS := $(OBJS) bmatrix.o swzmatrix.o dw_error.o dw_rand.o dw_matrix_rand.o dw_array.o dw_matrix_array.o dw_matrix_sort.o dw_ascii.o dw_parse_cmd.o
# TAO FILES
OBJS := $(OBJS)
......
......@@ -5,7 +5,7 @@
#define __SWITCHING_VER_100__
#include "matrix.h"
#include "swzmatrix.h"
//=== Declaring structures so pointers can be defined ===
struct TStateModel_tag;
......
#include "matrix.h"
#include "swzmatrix.h"
#include "dw_rand.h"
#include "dw_parse_cmd.h"
#include "dw_ascii.h"
......
......@@ -4,7 +4,7 @@
#include "switch.h"
#include "switchio.h"
#include "dw_error.h"
#include "matrix.h"
#include "swzmatrix.h"
#include "bmatrix.h"
#include "dw_array.h"
#include "dw_matrix_array.h"
......
......@@ -3,7 +3,7 @@
#define __VAR_BASE_MODEL__
#include "switch.h"
#include "matrix.h"
#include "swzmatrix.h"
#include "dw_matrix_array.h"
#define standard_ordering 1 // for future implementation
......
......@@ -2,7 +2,7 @@
#ifndef __MODIFIED_HARMONIC_MEAN_
#define __MODIFIED_HARMONIC_MEAN_
#include "matrix.h"
#include "swzmatrix.h"
#include "switch.h"
#include "VARbase.h"
......
#include "matrix.h"
#include "swzmatrix.h"
#include "dw_ascii.h"
#include "dw_rand.h"
#include "dw_matrix_rand.h"
......
......@@ -2,7 +2,7 @@
#ifndef __MATRIX_ARRAY__
#define __MATRIX_ARRAY__
#include "matrix.h"
#include "swzmatrix.h"
#include "dw_array.h"
extern TElementSpecification dw_VectorSpecs;
......
#include "matrix.h"
#include "swzmatrix.h"
#include "bmatrix.h"
#include "dw_error.h"
......
......@@ -2,7 +2,7 @@
#ifndef __TZ2DW__
#define __TZ2DW__
#include "matrix.h"
#include "swzmatrix.h"
// flags and defines
#define NEARINFINITY 1.0E+300
......
......@@ -2,7 +2,7 @@
#ifndef __SORT_MATRICES__
#define __SORT_MATRICES__
#include "matrix.h"
#include "swzmatrix.h"
TVector SortVectorAscending(TVector x, TVector y);
TVector SortVectorDescending(TVector x, TVector y);
......
#include "matrix.h"
#include "swzmatrix.h"
char* SphericalType(void);
void SetupSpherical_Gaussian(int n);
......
......@@ -2,7 +2,7 @@
#ifndef __RANDOM_MATRIX__
#define __RANDOM_MATRIX__
#include "matrix.h"
#include "swzmatrix.h"
/* Random Matrices and Vectors */
TVector dw_UniformVector(TVector x);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment