Revision 1025

trunk/scripts/admb/admb (revision 1025)
144 144
    echo -e "\\nError: Could not compile $file\\n"
145 145
    exit 1
146 146
  fi
147
  objs="$objs ${file%.*}.o"
147
  objs="${file%.*}.o $objs"
148 148
done
149 149

  
150 150
if [ ! -z "$c" ]; then
trunk/src/df1b2-separable/f1b2vc1.cpp (revision 1025)
576 576
}
577 577

  
578 578
/**
579
 * Construct df1b2vector from dvector v.
580
 */
581
df1b2vector::df1b2vector(const dvector& v)
582
{
583
  if (!v)
584
  {
585
    allocate();
586
  }
587
  else
588
  {
589
    const int lb = v.indexmin();
590
    const int ub = v.indexmax();
591
    if (lb<=ub)
592
    {
593
      allocate(lb,ub);
594
      for (int i = lb; i <= ub; i++)
595
      {
596
        (*this)[i] = v[i];
597
      }
598
    }
599
  }
600
}
601

  
602
/**
579 603
 * Description not yet available.
580 604
 * \param
581 605
 */
trunk/src/df1b2-separable/f1b2vc5.cpp (revision 1025)
776 776
}
777 777

  
778 778
/**
779
 * Copy values of vector v into column j.
780
 */
781
void df1b2matrix::colfill(const int j, const df1b2vector& v)
782
{
783
  //RETURN_ARRAYS_INCREMENT();   makes no sense for df1b2 stuff
784
  for (int i=rowmin(); i<=rowmax(); i++)
785
  {
786
    (*this)[i][j]=v[i];
787
  }
788
  //RETURN_ARRAYS_DECREMENT();
789
}
790

  
791
/**
779 792
 * Description not yet available.
780 793
 * \param
781 794
 */
trunk/src/df1b2-separable/df1b2fun.h (revision 1025)
936 936
  int indexmax(void)const {return index_max;}
937 937
  int size(){return index_max-index_min+1;}
938 938
  df1b2vector(int lb,int ub);
939
  df1b2vector(const dvector& v);
939 940
  ~df1b2vector();
940 941
  df1b2vector(const df1b2vector&);
941 942
  void copy(const df1b2vector&);
......
1014 1015
  int allocated(void){return v!=0;}
1015 1016
  void initialize(void);
1016 1017
  ~df1b2matrix();
1018
  void colfill(const int j, const df1b2vector& v);
1017 1019
  int rowmin(void) const {return index_min;}
1018 1020
  int indexmin(void) const {return index_min;}
1019 1021
  int indexmax(void) const {return index_max;}
trunk/tests/GNUmakefile (revision 1025)
107 107
beta3:
108 108
	OPTIONS=-s $(MAKE) --directory=$@
109 109

  
110
gtest: gtest-colfill
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff