[QuantLibAddin-cvs] QuantLibAddin/qlo ratehelpers.cpp,1.5,1.6

[Eric E. <eri...@us...>]

Update of /cvsroot/quantlibaddin/QuantLibAddin/qlo
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13401/qlo

Modified Files:
	ratehelpers.cpp 
Log Message:
replace 'instanceName/handle' with 'objectID'

Index: ratehelpers.cpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/ratehelpers.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ratehelpers.cpp	22 Jun 2006 15:18:13 -0000	1.5
--- ratehelpers.cpp	16 Jul 2006 10:42:41 -0000	1.6
***************
*** 128,132 ****
          struct RateHelperItem {
              bool isFutures;
!             std::string instanceName;
              bool includeFlag;
              long priority;
--- 128,132 ----
          struct RateHelperItem {
              bool isFutures;
!             std::string objectID;
              bool includeFlag;
              long priority;
***************
*** 134,143 ****
              QuantLib::Date latestDate;
              RateHelperItem(bool isFutures,
!                            const std::string& instanceName,
                             const bool includeFlag,
                             const long& priority,
                             const QuantLib::Date& earliestDate, 
                             const QuantLib::Date& latestDate)
!             : isFutures(isFutures), instanceName(instanceName),
                includeFlag(includeFlag), priority(priority),
                earliestDate(earliestDate), latestDate(latestDate) {}
--- 134,143 ----
              QuantLib::Date latestDate;
              RateHelperItem(bool isFutures,
!                            const std::string& objectID,
                             const bool includeFlag,
                             const long& priority,
                             const QuantLib::Date& earliestDate, 
                             const QuantLib::Date& latestDate)
!             : isFutures(isFutures), objectID(objectID),
                includeFlag(includeFlag), priority(priority),
                earliestDate(earliestDate), latestDate(latestDate) {}
***************
*** 157,161 ****
                          return false;
                      } else if (h1.priority == h2.priority) {
!                         return h1.instanceName > h2.instanceName;
                      }
                  }
--- 157,161 ----
                          return false;
                      } else if (h1.priority == h2.priority) {
!                         return h1.objectID > h2.objectID;
                      }
                  }
***************
*** 235,239 ****
              std::vector<detail::RateHelperItem>::const_iterator i;
              for (i = rhs.begin(); i != rhs.end(); i++)
!                 result.push_back(i->instanceName);
              return result;
          }
--- 235,239 ----
              std::vector<detail::RateHelperItem>::const_iterator i;
              for (i = rhs.begin(); i != rhs.end(); i++)
!                 result.push_back(i->objectID);
              return result;
          }
***************
*** 245,252 ****
          for (i=0; i<rhs.size()-1; i++) {
              if (rhs[i].latestDate < rhs[i+1].latestDate) 
!                 result.push_back(rhs[i].instanceName);
          }
          // add the last one in any case
!         result.push_back(rhs[i].instanceName);
  
          return result;
--- 245,252 ----
          for (i=0; i<rhs.size()-1; i++) {
              if (rhs[i].latestDate < rhs[i+1].latestDate) 
!                 result.push_back(rhs[i].objectID);
          }
          // add the last one in any case
!         result.push_back(rhs[i].objectID);
  
          return result;