Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dynare
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dynare
dynare
Commits
e4dee8ef
Commit
e4dee8ef
authored
8 years ago
by
Stéphane Adjemian
Browse files
Options
Downloads
Patches
Plain Diff
Fixed compatibility issues with julia 0.5.
parent
1229372a
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!1381
PR for #1286
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
julia/Dynare.jl
+4
-4
4 additions, 4 deletions
julia/Dynare.jl
julia/DynareModel.jl
+20
-20
20 additions, 20 deletions
julia/DynareModel.jl
julia/DynareOptions.jl
+1
-1
1 addition, 1 deletion
julia/DynareOptions.jl
julia/DynareOutput.jl
+1
-1
1 addition, 1 deletion
julia/DynareOutput.jl
with
26 additions
and
26 deletions
julia/Dynare.jl
+
4
−
4
View file @
e4dee8ef
...
@@ -27,8 +27,8 @@ function compile(modfile)
...
@@ -27,8 +27,8 @@ function compile(modfile)
unshift!
(
LOAD_PATH
,
pwd
())
unshift!
(
LOAD_PATH
,
pwd
())
end
end
# Process modfile
# Process modfile
println
(
string
(
"Using "
,
WORD_SIZE
,
"-bit preprocessor"
))
println
(
string
(
"Using "
,
Sys
.
WORD_SIZE
,
"-bit preprocessor"
))
preprocessor
=
string
(
dirname
(
@__FILE__
()),
"/preprocessor"
,
WORD_SIZE
,
"/dynare_m"
)
preprocessor
=
string
(
dirname
(
@__FILE__
()),
"/preprocessor"
,
Sys
.
WORD_SIZE
,
"/dynare_m"
)
run
(
`$preprocessor $modfile language=julia output=dynamic`
)
run
(
`$preprocessor $modfile language=julia output=dynamic`
)
end
end
...
@@ -38,12 +38,12 @@ macro dynare(modfiles...)
...
@@ -38,12 +38,12 @@ macro dynare(modfiles...)
for
modfile
in
modfiles
for
modfile
in
modfiles
eval
(
:
(
compile
(
$
modfile
)))
eval
(
:
(
compile
(
$
modfile
)))
basename
=
split
(
modfile
,
".mod"
;
keep
=
false
)
basename
=
split
(
modfile
,
".mod"
;
keep
=
false
)
push!
(
ex
.
args
,
Expr
(
:
import
,
s
ymbol
(
basename
[
1
])))
push!
(
ex
.
args
,
Expr
(
:
import
,
S
ymbol
(
basename
[
1
])))
end
end
else
else
eval
(
:
(
compile
(
$
modfiles
)))
eval
(
:
(
compile
(
$
modfiles
)))
basename
=
split
(
modfiles
[
1
],
".mod"
;
keep
=
false
)
basename
=
split
(
modfiles
[
1
],
".mod"
;
keep
=
false
)
push!
(
ex
.
args
,
Expr
(
:
importall
,
s
ymbol
(
basename
[
1
])))
push!
(
ex
.
args
,
Expr
(
:
importall
,
S
ymbol
(
basename
[
1
])))
end
end
return
ex
return
ex
end
end
...
...
This diff is collapsed.
Click to expand it.
julia/DynareModel.jl
+
20
−
20
View file @
e4dee8ef
...
@@ -23,27 +23,27 @@ export Model, Endo, Exo, ExoDet, Param, dynare_model
...
@@ -23,27 +23,27 @@ export Model, Endo, Exo, ExoDet, Param, dynare_model
abstract
Atom
abstract
Atom
immutable
Endo
<:
Atom
immutable
Endo
<:
Atom
name
::
UTF8
String
name
::
String
tex_name
::
UTF8
String
tex_name
::
String
long_name
::
UTF8
String
long_name
::
String
end
end
immutable
Exo
<:
Atom
immutable
Exo
<:
Atom
name
::
UTF8
String
name
::
String
tex_name
::
UTF8
String
tex_name
::
String
long_name
::
UTF8
String
long_name
::
String
end
end
immutable
ExoDet
<:
Atom
immutable
ExoDet
<:
Atom
name
::
UTF8
String
name
::
String
tex_name
::
UTF8
String
tex_name
::
String
long_name
::
UTF8
String
long_name
::
String
end
end
immutable
Param
<:
Atom
immutable
Param
<:
Atom
name
::
UTF8
String
name
::
String
tex_name
::
UTF8
String
tex_name
::
String
long_name
::
UTF8
String
long_name
::
String
end
end
immutable
AuxVars
immutable
AuxVars
...
@@ -52,7 +52,7 @@ immutable AuxVars
...
@@ -52,7 +52,7 @@ immutable AuxVars
orig_index
::
Int
orig_index
::
Int
orig_lead_lag
::
Int
orig_lead_lag
::
Int
eq_nbr
::
Int
eq_nbr
::
Int
orig_expr
::
UTF8
String
orig_expr
::
String
end
end
immutable
PredVars
immutable
PredVars
...
@@ -73,14 +73,14 @@ end
...
@@ -73,14 +73,14 @@ end
immutable
EquationTag
immutable
EquationTag
eq_nbr
::
Int
eq_nbr
::
Int
name
::
UTF8
String
name
::
String
value
::
UTF8
String
value
::
String
end
end
type
Model
type
Model
fname
::
ASCII
String
fname
::
String
dname
::
ASCII
String
dname
::
String
dynare_version
::
ASCII
String
dynare_version
::
String
endo
::
Vector
{
Endo
}
endo
::
Vector
{
Endo
}
exo
::
Vector
{
Exo
}
exo
::
Vector
{
Exo
}
exo_det
::
Vector
{
ExoDet
}
exo_det
::
Vector
{
ExoDet
}
...
@@ -111,7 +111,7 @@ type Model
...
@@ -111,7 +111,7 @@ type Model
analytical_steady_state
::
Bool
analytical_steady_state
::
Bool
user_written_analytical_steady_state
::
Bool
user_written_analytical_steady_state
::
Bool
static_and_dynamic_models_differ
::
Bool
static_and_dynamic_models_differ
::
Bool
equation_tags
::
Vector
{
UTF8
String
}
equation_tags
::
Vector
{
String
}
exo_names_orig_ord
::
Vector
{
Int
}
exo_names_orig_ord
::
Vector
{
Int
}
sigma_e
::
Matrix
{
Float64
}
sigma_e
::
Matrix
{
Float64
}
correlation_matrix
::
Matrix
{
Float64
}
correlation_matrix
::
Matrix
{
Float64
}
...
@@ -160,7 +160,7 @@ function dynare_model()
...
@@ -160,7 +160,7 @@ function dynare_model()
false
,
# analytical_steady_state
false
,
# analytical_steady_state
false
,
# user_written_analytical_steady_state
false
,
# user_written_analytical_steady_state
false
,
# static_and_dynamic_models_differ
false
,
# static_and_dynamic_models_differ
Array
(
ASCII
String
,
0
),
# equation_tags
Array
(
String
,
0
),
# equation_tags
Array
(
Int64
,
1
),
# exo_names_orig_ord
Array
(
Int64
,
1
),
# exo_names_orig_ord
Array
(
Float64
,
0
,
0
),
# sigma_e (Cov matrix of the structural innovations)
Array
(
Float64
,
0
,
0
),
# sigma_e (Cov matrix of the structural innovations)
Array
(
Float64
,
0
,
0
),
# correlation_matrix (Corr matrix of the structural innovations)
Array
(
Float64
,
0
,
0
),
# correlation_matrix (Corr matrix of the structural innovations)
...
...
This diff is collapsed.
Click to expand it.
julia/DynareOptions.jl
+
1
−
1
View file @
e4dee8ef
...
@@ -36,7 +36,7 @@ function pfmsolver_set_defaults()
...
@@ -36,7 +36,7 @@ function pfmsolver_set_defaults()
end
end
type
Options
type
Options
dynare_version
::
ASCII
String
dynare_version
::
String
linear
::
Bool
linear
::
Bool
pfmsolver
::
PFMSolver
pfmsolver
::
PFMSolver
end
end
...
...
This diff is collapsed.
Click to expand it.
julia/DynareOutput.jl
+
1
−
1
View file @
e4dee8ef
...
@@ -21,7 +21,7 @@ module DynareOutput
...
@@ -21,7 +21,7 @@ module DynareOutput
export
Ouput
,
dynare_output
export
Ouput
,
dynare_output
type
Output
type
Output
dynare_version
::
ASCII
String
dynare_version
::
String
steady_state
::
Vector
{
Float64
}
steady_state
::
Vector
{
Float64
}
exo_steady_state
::
Vector
{
Float64
}
exo_steady_state
::
Vector
{
Float64
}
end
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment