View difference between Paste ID: 855eX1d8 and YGiL8ZS8

 /**
- SineWaver.cpp
+ SineWaver.cpp - now with a #define!
 
  This program will draw sine waves that look like this:
 
            ,-'`'-,             ,-'`'-,
           /       \           /
          /         \         /
         /           \       /
  `'-.-'`             `'-.-'`
 
          ,-'`'-,
         /       \
  `'-.-'`         `'-.-'`
 
  The program requires two arguments: how many periods to
  draw and the height of the wave. I might program in a
  "cosine" option to change whether the wave draws up
  or down to begin with. Ooh, and perhaps cross them too!
 */
 #include <stdio.h>
 #include <stdlib.h>
 #include <iostream>
 #include <string>
 
 #define CURVEOFFSET 2
 
 char upCurve='/';
 char dnCurve='\\';
 std::string peakPattern=",-'`'-,";
 std::string valiPattern="`'-.-'`";
 
 class Wave
 {
  private:
   int qPeriod;
   int height;
   int waveX;
   int waveY;
  public:
   Wave(int qperFeed, int hiFeed) : qPeriod(qperFeed), height(hiFeed), waveX(0), waveY(hiFeed)
   {
    // derive the dimensions of the wave which will result
 
    // we need to check if the lengths of the peak and valley are equal
    int peakLen=peakPattern.length();
    int valiLen=valiPattern.length();
    if (!(peakLen==valiLen)) {
     fprintf(stderr,"Internal error: mismatch between peak and valley string patterns\n");
     exit(4);
    }
 
    // error checking passed. let's find out how wide our curve will be.
    for (int i=0;i<qPeriod;i++)
    {
     switch (i%4)
-     case 1: waveX+=(height-2); break;
+
      case 0: waveX+=valiLen; break;
-     case 3: waveX+=(height-2); break;
+     case 1: waveX+=(height-CURVEOFFSET); break;
      case 2: waveX+=peakLen; break;
      case 3: waveX+=(height-CURVEOFFSET); break;
     }
    }
 
    //printf("waveX = %d\nwaveY = %d\n",waveX,waveY);
   }
 
   void draw()
   {
    std::string thisRow;
    char thisChar;
    for (int q=1; q<=waveY; q++)
    {
     thisRow="";
-     int charPos = r%(peakPattern.length()+2*(height-2)+valiPattern.length())+1;
+
     {
      int charPos = r%(peakPattern.length()+2*(height-CURVEOFFSET)+valiPattern.length())+1;
      //fprintf(stderr,"%dx%d: %d\n",q,r,charPos);
-      if ((charPos > valiPattern.length() + (height-2)) &&
+
-      (charPos <= valiPattern.length() + (height-2) + peakPattern.length()))
+
-       thisChar=peakPattern[(charPos-peakPattern.length()-(height-2))-1];
+      if ((charPos > valiPattern.length() + (height-CURVEOFFSET)) &&
       (charPos <= valiPattern.length() + (height-CURVEOFFSET) + peakPattern.length()))
        thisChar=peakPattern[(charPos-peakPattern.length()-(height-CURVEOFFSET))-1];
       else
        thisChar=' ';
      }
      else if (q==waveY)
      {
       if (charPos <= valiPattern.length())
        thisChar=valiPattern[charPos-1];
       else
        thisChar=' ';
      }
      else
      {
       if ((charPos > valiPattern.length()) && (charPos <= (valiPattern.length() + height-2)) &&
-      else if (charPos > (valiPattern.length() + (height-2) + peakPattern.length()) &&
+
-      (charPos - (valiPattern.length() + (height-2) + peakPattern.length()) == (q-1)))
+
       else if (charPos > (valiPattern.length() + (height-CURVEOFFSET) + peakPattern.length()) &&
       (charPos - (valiPattern.length() + (height-CURVEOFFSET) + peakPattern.length()) == (q-1)))
        thisChar=dnCurve;
       else
        thisChar=' ';
      }
     thisRow+=thisChar;
     }
     std::cout << thisRow << std::endl;
    }
   }
 
   int GetQPeriod() { return qPeriod; }
   int GetHeight() { return height; }
 };
 
 int main(int argc, char* argv[])
 {
  int noQuarterPeriod;
  int waveHeight;
  if (argc < 3)
  {
-   "Usage: SineWaver #-of-quarter-periods wave-height\n");
+
    "This program requires at least two arguments.\n"
    "Usage: SineWaver [#-of-quarter-periods] [wave-height]\n");
   exit(1);
  }
  else
  {
   noQuarterPeriod = atoi(argv[1]);
   if (noQuarterPeriod < 1)
   {
    fprintf(stderr,
     "The number of quarter periods must be a positive number!\n"
     "You gave me %d instead.\n",noQuarterPeriod);
    exit(2);
   }
   waveHeight = atoi(argv[2]);
   if (waveHeight < 2)
   {
    fprintf(stderr,
     "The wave height is too short! The minimum is 2.\n"
     "You gave me a height of %d instead.\n",waveHeight);
    exit(3);
   }
  }
 
  // We'll make a pretty message by smartly analyzing how many periods we have.
- std::string initPattern="Generating wave with ";
+
  int nQPM=(noQuarterPeriod%4);
  std::string initPattern="Generating wave with a height of %d and ";
  if (noQuarterPeriod < 4)
  {
   noFullPeriod=0;
   initPattern+="\%d/\%d period";
  }
  else if (nQPM)
  {
   noFullPeriod=noQuarterPeriod/4;
   initPattern+="\%d \%d/\%d periods";
  }
  else {
   noFullPeriod=noQuarterPeriod/4;
   initPattern+="\%d period";
   if (noFullPeriod>1) { initPattern+="s";}
- printf(initPattern.c_str(),
+
  initPattern+="...\n";
  printf(initPattern.c_str(),waveHeight,
    (noFullPeriod)?noFullPeriod:(nQPM==2)?1:nQPM,
    (noFullPeriod)?((nQPM==2)?1:nQPM):(nQPM==2)?2:4,
    (nQPM==2)?2:4);
  Wave sineWave(noQuarterPeriod,waveHeight);
  sineWave.draw();
 
  return 0;
 }