Revision 1162

trunk/scripts/admb/admb (revision 1162)
30 30
PATH=$ADMB_HOME/bin:$PATH
31 31

  
32 32
# Pop args until model=$1
33
unset debug
33 34
unset bounds
34 35
unset d
35 36
unset dll
......
44 45
  case $A in
45 46
    d) d=-d; dll=-dll
46 47
       ;;
47
    g) g=-g
48
    g) g=-g; debug=-debug
48 49
       ;;
49 50
    r) r=-r; tpl2cpp=tpl2rem
50 51
       ;;
......
96 97
  rm -vf tfile1 tfile2 tfile3 tfile4 tfile5
97 98
  rm -f $model.cpp $model.htp $model.o $model
98 99

  
99
  CMD="$tpl2cpp $bounds $dll $model"
100
  CMD="$tpl2cpp $debug $bounds $dll $model"
100 101
  echo -e \\n\*\*\* $CMD
101 102
  eval $CMD
102 103
  if [ ! -f $model.cpp -o ! -f $model.htp ]; then
trunk/scripts/admb/admb.bat (revision 1162)
31 31
set objs=
32 32
set s=-s 
33 33
set bounds=-bounds
34
set debug=
34 35

  
35 36
for %%a in (%*) do (
36 37
  set arg=%%a
......
41 42
    )
42 43
    if %%a==-g (
43 44
      set g=-g
45
      set debug=-debug
44 46
    )
45 47
    if %%a==-r (
46 48
      set r=-r 
......
88 90
  del xxalloc.tmp xxalloc1.tmp xxalloc2.tmp xxalloc3.tmp xxalloc4.tmp xxalloc5.tmp xxalloc6.tmp header.tmp 2> NUL
89 91
  del tfile1 tfile2 tfile3 tfile4 tfile5 2> NUL
90 92
  del !model!.cpp !model!.htp !model!.obj !model!.exe 2> NUL
91
  set CMD=!parser! !bounds! !dll! !model!
93
  set CMD=!parser! !debug! !bounds! !dll! !model!
92 94
  echo.&echo *** !CMD!
93 95
  call !CMD!
94 96
  if not exist !model!.cpp goto ERROR
trunk/src/Makefile (revision 1162)
83 83
$(DESTDIR)\bin\tpl2rem.exe: $(LEXDESTDIR)\tpl2rem.c
84 84
	$(CC) /nologo /TC /Fo$(LEXDESTDIR)\ /Fe$@ $(LEXDESTDIR)\tpl2rem.c
85 85

  
86
$(LEXDESTDIR)\tpl2rem.c: df1b2-seperable\tpl2rem.lex
87
	..\utilities\flex -o$(LEXDESTDIR)\lex.yy.c df1b2-seperable\tpl2rem.lex
88
	..\utilities\sed -f df1b2-seperable\sedflex $(LEXDESTDIR)\lex.yy.c > $@
86
$(LEXDESTDIR)\tpl2rem.c: df1b2-separable\tpl2rem.lex
87
	..\utilities\flex -o$(LEXDESTDIR)\lex.yy.c df1b2-separable\tpl2rem.lex
88
	..\utilities\sed -f df1b2-separable\sedflex $(LEXDESTDIR)\lex.yy.c > $@
89 89

  
90 90
includes:
91 91
	IF NOT EXIST $(DESTDIR)\include md $(DESTDIR)\include
trunk/src/nh99/tpl2cpp.lex (revision 1162)
3604 3604
   /* fprintf(fdat,"%s","};\n");*/
3605 3605
    fprintf(fall,"%s","}\n\nvoid model_parameters::userfunction(void)\n{\n");
3606 3606
    fprintf(fall,"  %s%s",objective_function_name_string," =0.0;\n");
3607
    if(yy_flex_debug){
3607
    if(splus_debug_flag){
3608 3608
      fprintf(fall,"  pad();\n");
3609 3609
    }
3610 3610

  
trunk/src/df1b2-separable/tpl2rem.lex (revision 1162)
3821 3821
    fprintf(fall,"%s","void model_parameters::userfunction(void)"
3822 3822
      "\n{\n");
3823 3823
    fprintf(fall,"  %s%s",objective_function_name_string," =0.0;\n");
3824
    if(splus_debug_flag){
3825
      fprintf(fall,"  pad();\n");
3826
    }
3827

  
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff