simulate.dll has been replaced by bytecode.dll

git-svn-id: https://www.dynare.org/svn/dynare/trunk@2881 ac1d8469-bf42-47a9-8791-bf33cf982152

matlab/dynare_config.m

@@ -152,8 +152,8 @@ for i=1:number_of_mex_files
     disp([ message mex_status{i,3} '.' ])
 end
 
-% Test if simulate DLL is present
-if exist('simulate') == 3
+% Test if bytecode DLL is present
+if exist('bytecode') == 3
   remove_path_to_mex = 0;
   if ~multithread_flag
       message = '[mex] ';
@@ -163,7 +163,7 @@ if exist('simulate') == 3
 else
   message = '[no]  ';
 end
-disp([ message 'Fast model evaluation.' ])
+disp([ message 'Bytecode evaluation.' ])
 
 if remove_path_to_mex
   rmpath(path_to_mex_files);

matlab/global_initialization.m

@@ -224,7 +224,7 @@ function global_initialization()
   % did model undergo block decomposition + minimum feedback set computation ?
   options_.block = 0;
 
-  % model evaluated using simulate.dll
+  % model evaluated using bytecode.dll
   options_.bytecode = 0;
   
   % SWZ SBVAR

matlab/simul.m

@@ -57,21 +57,33 @@ ct_=0;
 
 if options_.simul_algo == 0
   if ~ options_.initval_file
-      make_ex_;
-      make_y_;
+      if ~isfield(options_,'datafile')
+        make_ex_;
+        make_y_;
+      else
+          read_data_;
+      end
   end
-
+  
   if isempty(options_.scalv) | options_.scalv == 0
     options_.scalv = oo_.steady_state ;
   end
 
   options_.scalv= 1 ;
 
-  if M_.maximum_endo_lag ==1 & M_.maximum_endo_lead <= 1
-    sim1 ;
+  if(options_.block)
+      if(options_.bytecode)
+          oo_.endo_simul=bytecode('dynamic');
+      else
+          eval([M_.fname '_dynamic']);
+      end;
   else
-    simk ;
-  end
+      if M_.maximum_endo_lag ==1 & M_.maximum_endo_lead <= 1
+         sim1 ;
+      else
+         simk ;
+      end
+  end;
 else
   set_default_option('replic',1);
   set_default_option('simul_seed',1);

matlab/steady_.m

@@ -80,7 +80,7 @@ function steady_()
                           oo_.exo_det_steady_state], M_.params);
     end
   elseif options_.block && options_.bytecode
-      [oo_.steady_state,check] = simulate('steady_state');
+      [oo_.steady_state,check] = bytecode('steady_state');
   else
     [oo_.steady_state,check] = dynare_solve([M_.fname '_static'],...
 				     oo_.steady_state,...

mex/sources/build_matlab.m

@@ -135,5 +135,5 @@ eval([ COMPILE_COMMAND ' -DMATLAB -Igensylv/cc ' ...
        'gensylv/cc/Vector.cpp ' ...
        BLAS_PATH ' ' LAPACK_PATH ]);
 
-disp('Compiling simulate...')
-eval([ COMPILE_COMMAND ' -Isimulate -I../../preprocessor simulate/simulate.cc simulate/Interpreter.cc simulate/Mem_Mngr.cc simulate/SparseMatrix.cc']);
+disp('Compiling bytecode...')
+eval([ COMPILE_COMMAND ' -Ibytecode -I../../preprocessor bytecode/bytecode.cc bytecode/Interpreter.cc bytecode/Mem_Mngr.cc bytecode/SparseMatrix.cc']);

mex/sources/build_matlab_multithread.m

@@ -114,7 +114,7 @@ try
     disp('|  OpenMp is used (multithreaded mex files) for: |')
     disp('|   * sparse_hessian_times_B_kronecker_C.cc      |')
     disp('|   * A_times_B_kronecker_C.cc                   |')
-    disp('|   * simulate (SparseMatrix.cc)                 |')
+    disp('|   * bytecode (SparseMatrix.cc)                 |')
     disp('|------------------------------------------------|')
     disp(' ')
     COMPILE_OPTIONS_OMP = [ COMPILE_OPTIONS  CFLAGS CXXFLAGS LDFLAGS ];
@@ -161,5 +161,5 @@ eval([ COMPILE_COMMAND ' -DMATLAB -Igensylv/cc ' ...
        'gensylv/cc/Vector.cpp ' ...
        BLAS_PATH ' ' LAPACK_PATH ]);
 
-disp('Compiling simulate...')
-eval([ COMPILE_COMMAND_OMP ' -Isimulate -I../../preprocessor simulate/simulate.cc simulate/Interpreter.cc simulate/Mem_Mngr.cc simulate/SparseMatrix.cc']);
+disp('Compiling bytecode...')
+eval([ COMPILE_COMMAND_OMP ' -Ibytecode -I../../preprocessor bytecode/bytecode.cc bytecode/Interpreter.cc bytecode/Mem_Mngr.cc bytecode/SparseMatrix.cc']);

mex/sources/bytecode/SparseMatrix.hh

@@ -26,11 +26,11 @@
 #include <map>
 #include <ctime>
 #include "Mem_Mngr.hh"
-#ifdef NO_OPENMP
+/*#ifdef NO_OPENMP
 // Nothing to single thread version.
 #else
   #include <omp.h>
-#endif
+#endif*/
 #ifdef _MSC_VER
   #include <limits>
 #endif

mex/sources/bytecode/bytecode.cc

@@ -24,7 +24,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 #include <cstring>
-#include "simulate.hh"
+#include "bytecode.hh"
 #include "Interpreter.hh"
 #include "Mem_Mngr.hh"
 

preprocessor/ComputingTasks.cc

@@ -94,24 +94,7 @@ void
 SimulStatement::writeOutput(ostream &output, const string &basename) const
 {
   options_list.writeOutput(output);
-  if (!block)
-    output << "simul(oo_.dr);\n";
-  else
-    {
-      output << "if (~ options_.initval_file) & (size(oo_.endo_simul,2)<options_.periods)" << endl
-             << "  if ~isfield(options_,'datafile')" << endl
-             << "    make_y_;" << endl
-             << "    make_ex_;" << endl
-             << "  else" << endl
-             << "    read_data_;" << endl
-             << "  end" << endl
-             << "end" << endl;
-      if (byte_code)
-          output << "oo_.endo_simul=simulate;" << endl;
-        else
-          output << basename << "_dynamic;" << endl;
-      output << "dyn2vec;" << endl;
-    }
+  output << "simul(oo_.dr);\n";
 }
 
 StochSimulStatement::StochSimulStatement(const SymbolList &symbol_list_arg,

preprocessor/DynamicModel.hh

@@ -143,7 +143,7 @@ public:
   virtual NodeID AddVariable(const string &name, int lag = 0);
   //! Absolute value under which a number is considered to be zero
   double cutoff;
-  //! The weight of the Markowitz criteria to determine the pivot in the linear solver (simul_NG1 and simul_NG from simulate.cc)
+  //! The weight of the Markowitz criteria to determine the pivot in the linear solver (simul_NG1 and simul_NG from bytecode.cc)
   double markowitz;
   //! Compute the minimum feedback set in the dynamic model:
   /*!   0 : all endogenous variables are considered as feedback variables