[ogs-changes] dist/c++/test CoreTest03.cpp,1.1,1.2

[<ele...@us...>]

Update of /cvsroot/ogs/dist/c++/test
In directory sc8-pr-cvs1:/tmp/cvs-serv9450/c++/test

Modified Files:
	CoreTest03.cpp 
Log Message:
See ChangeLog files (Apr 3-4) for details.


Index: CoreTest03.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/test/CoreTest03.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CoreTest03.cpp	5 Feb 2003 06:01:31 -0000	1.1
--- CoreTest03.cpp	4 Apr 2003 20:22:47 -0000	1.2
***************
*** 28,32 ****
  
  #include <ogs/Support.h>
! #include <ogs/core/Ability.h>
  #include <ogs/core/Modifier.h>
  
--- 28,32 ----
  
  #include <ogs/Support.h>
! #include <ogs/core/Abilities.h>
  #include <ogs/core/Modifier.h>
  
***************
*** 46,75 ****
  class Dexterity: public Ability {
    public:
!     Dexterity (Ability::Method method = Ability::standardMethod);
! };
! 
! Dexterity::Dexterity (Ability::Method method): Ability (method) { }
! 
! void print (Dexterity& dex) {
!   std::cout << "dex.getOriginalScore () = " <<
!                 dex.getOriginalScore () << std::endl;
!   std::cout << "dex.getCurrentScore () = " <<
!                 dex.getCurrentScore () << std::endl;
!   Modifier& mod = dex.getModifier ();
!   std::cout << "mod.getValue () = " <<
!                 mod.getValue () << std::endl;
  
!   std::cout << std::endl;
! }
  
! void test (void) {
!   std::cout << "Defining dex2 with average method..." << std::endl;
!   Dexterity dex2 (Ability::averageMethod);;
!   print (dex2);
  
!   std::cout << "Defining dex3 with high-powered method..." << std::endl;
!   Dexterity dex3 (Ability::highPoweredMethod);;
!   print (dex3);
! }
  
  int main (void)
--- 46,65 ----
  class Dexterity: public Ability {
    public:
!     Dexterity (): Ability (Ability::DEX) {
!       // empty constructor body
!     }
  
!     Dexterity (Ability::Method& method): 
!       Ability (Ability::DEX, method) {
!       // empty constructor body
!     }
! };
  
! void print (Dexterity& dex);
! void test (void);
  
! Ability::StandardMethod standardMethod;
! Ability::AverageMethod averageMethod;
! Ability::HighPoweredMethod highPoweredMethod;
  
  int main (void)
***************
*** 77,84 ****
    std::srand (std::time (NULL));
  
    std::cout << "Ability modifiers are in parentheses" << std::endl;
    std::cout << "Printing 6 sample rolls of rollStandard ()" << std::endl;
    for (int i = 0; i < 6; ++i) {
!     Ability::Score score = Ability::rollStandard ();
      std::cout << score << " (" << std::showpos
                << Ability::getModifier (score) << "), ";
--- 67,75 ----
    std::srand (std::time (NULL));
  
+   /* Print a some scores generated by predefined methods. */
    std::cout << "Ability modifiers are in parentheses" << std::endl;
    std::cout << "Printing 6 sample rolls of rollStandard ()" << std::endl;
    for (int i = 0; i < 6; ++i) {
!     Ability::Score score = standardMethod (Ability::DEX);
      std::cout << score << " (" << std::showpos
                << Ability::getModifier (score) << "), ";
***************
*** 88,92 ****
    std::cout << "Printing 6 sample rolls of rollAverage ()" << std::endl;
    for (int i = 0; i < 6; ++i) {
!     Ability::Score score = Ability::rollAverage ();
      std::cout << score << " (" << std::showpos
                << Ability::getModifier (score) << "), ";
--- 79,83 ----
    std::cout << "Printing 6 sample rolls of rollAverage ()" << std::endl;
    for (int i = 0; i < 6; ++i) {
!     Ability::Score score = averageMethod (Ability::DEX);
      std::cout << score << " (" << std::showpos
                << Ability::getModifier (score) << "), ";
***************
*** 96,100 ****
    std::cout << "Printing 6 sample rolls of rollHighPowered()" << std::endl;
    for (int i = 0; i < 6; ++i) {
!     Ability::Score score = Ability::rollHighPowered ();
      std::cout << score << " (" << std::showpos
                << Ability::getModifier (score) << "), ";
--- 87,91 ----
    std::cout << "Printing 6 sample rolls of rollHighPowered()" << std::endl;
    for (int i = 0; i < 6; ++i) {
!     Ability::Score score = highPoweredMethod (Ability::DEX);
      std::cout << score << " (" << std::showpos
                << Ability::getModifier (score) << "), ";
***************
*** 112,116 ****
    std::cout << "Adding +1 modifier to dex1..." << std::endl;
    Modifier mod1 (+1);
!   dex1.addModifier (mod1);
    print (dex1);
  
--- 103,107 ----
    std::cout << "Adding +1 modifier to dex1..." << std::endl;
    Modifier mod1 (+1);
!   (dex1.getModifiers ()).addModifier (mod1);
    print (dex1);
  
***************
*** 121,129 ****
    std::cout << "Adding +3 modifier to dex1..." << std::endl;
    Modifier mod2 (+3);
!   dex1.addModifier (mod2);
!   print (dex1);
! 
!   std::cout << "Changing original score of dex1 to 20..." << std::endl;
!   dex1.setOriginalScore (20);
    print (dex1);
  
--- 112,116 ----
    std::cout << "Adding +3 modifier to dex1..." << std::endl;
    Modifier mod2 (+3);
!   (dex1.getModifiers ()).addModifier (mod2);
    print (dex1);
  
***************
*** 133,136 ****
--- 120,145 ----
  
    return (0);
+ }
+ 
+ void print (Dexterity& dex) {
+   std::cout << "dex.getOriginalScore () = " <<
+                 dex.getOriginalScore () << std::endl;
+   std::cout << "dex.getCurrentScore () = " <<
+                 dex.getCurrentScore () << std::endl;
+   Modifier& mod = dex.getModifier ();
+   std::cout << "mod.getValue () = " <<
+                 mod.getValue () << std::endl;
+ 
+   std::cout << std::endl;
+ }
+ 
+ void test (void) {
+   std::cout << "Defining dex2 with average method..." << std::endl;
+   Dexterity dex2 (averageMethod);
+   print (dex2);
+ 
+   std::cout << "Defining dex3 with high-powered method..." << std::endl;
+   Dexterity dex3 (highPoweredMethod);;
+   print (dex3);
  }