Sync with csc220summer19 repo

whuber · whuber · commit a7f758452a84 · 2020-06-17T16:52:24.000-07:00
diff --git a/bash/bash1/example.sh b/bash/bash1/example.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Parameter 1 is a name, parameter 2 is a number
+
+echo "Example\t\tshell\t\tscript"
+echo -e "Example\t\tshell\t\tscript"
+
+# run command
+echo
+echo "Your files: "
+ls
+
+# run a command inside a string
+echo "Date: `date`"
+
+# run a different shell script
+./hello.sh $1
+
+
+ii=1
+while [ $ii -le $2 ] 
+do
+  echo $ii
+  ii=$((ii+1))
+done
diff --git a/bash/bash1/hello.sh b/bash/bash1/hello.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# No space around = in an assignment
+greeting="Hello"
+person="World"
+
+if [ $# -ne 0 ]
+then
+    person=$1
+fi
+
+if [ $person = "Wade" ]
+then
+    echo "$greeting, professor"
+else
+    echo "$greeting, $person"
+fi
diff --git a/bash/bash1/nd.sh b/bash/bash1/nd.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Create a new directory with a README file inside
+
+if [ $# -eq 0 ]
+then
+  echo "No directory name specified."
+else
+  mkdir $1
+  cd $1
+  cat > README.TXT << EOL
+This directory was created automatically.
+Use it wisely!
+EOL
+
+fi
diff --git a/bash/bash1/simple.sh b/bash/bash1/simple.sh
@@ -0,0 +1,6 @@
+echo "Files:"
+ls
+echo
+echo "Counts:"
+wc *
+echo "DATE: `date`"
diff --git a/bash/bash2/forloop.sh b/bash/bash2/forloop.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+STOP=5
+
+echo "Running a for loop"
+for ((ii=1;ii<$STOP;ii++))
+do
+  echo $ii
+done
+
+echo
+
+echo "Files in the current directory"
+allfiles=(*)
+cfiles=(*.c)
+
+echo $allfiles[0]
+echo ${allfiles[0]}
+echo ${allfiles[1]}
+echo
+
+echo "List of C files"
+for cfile in ${cfiles[@]}
+do
+  echo "  $cfile"
+done
+echo "Number of C files = ${#cfiles[@]}"
+echo
+
+echo "Loop over results of a command"
+cppfiles=($(find . -name "*.cpp"))
+for filename in ${cppfiles[@])}
+do
+  echo "  $filename"
+done
+
+filetocheck=${cfiles[0]}
+wordtocheck=printf
+echo "Does $wordtocheck appear in $filetocheck?"
+if grep -q $wordtocheck $filetocheck
+then
+  echo "$wordtocheck appears in $filetocheck"
+else
+  echo "$wordtocheck does not appear in $filetocheck"
+fi
diff --git a/c/c6/structnamespace.c b/c/c6/structnamespace.c
@@ -1,24 +1,23 @@
 #include<stdio.h>
 
-/* Create type "struct my_struct" */
+/* Create type struct my_struct */
 struct my_struct {
     int num;
     char name[10];
 };
 
-/* Create type "my_struct" */
+/* Create type my_struct */
 typedef struct {
     int count;
     float average;
 } my_struct;
 
 int main () {
-
     struct my_struct struct1 = {3, "my_struct"};
-    my_struct struct2 = {2, 3.14};
+    my_struct struct2 = {2, 1.234};
 
-    printf("num=%d, name=%s\n", struct1.num, struct1.name);
-    printf("count=%d, average=%f\n", struct2.count, struct2.average);
+    printf("struct mystruct: num=%d, name=%s\n", struct1.num, struct1.name);
+    printf(" mystruct: count=%d, average=%s\n", struct2.count, struct2.average);
 
     return 0;
-}
+}
diff --git a/cpp/cpp1/staff/employee.cpp b/cpp/cpp1/staff/employee.cpp
@@ -0,0 +1,10 @@
+#include<iostream>
+#include"employee.hpp"
+
+using namespace std;
+
+void Employee::print() {
+  StaffMember::print();
+  cout << "      SSN: " << ssn << endl;
+  cout << " Pay rate: " << payrate << endl;
+}
diff --git a/cpp/cpp1/staff/employee.hpp b/cpp/cpp1/staff/employee.hpp
@@ -0,0 +1,21 @@
+// Employee class
+#ifndef EMPLOYEE_HPP
+#define EMPLOYEE_HPP
+#include"staffmember.hpp"
+
+class Employee : public StaffMember{
+  private:
+    std::string ssn;
+  protected:
+    int payrate;
+  public :
+    Employee(std::string n, std::string a, std::string p, 
+              std::string s, int r) :
+       StaffMember(n, a, p)
+    {
+       ssn = s;
+       payrate = r;
+    }
+  void print();
+};
+#endif
diff --git a/cpp/cpp1/staff/hourly.cpp b/cpp/cpp1/staff/hourly.cpp
@@ -0,0 +1,6 @@
+#include<iostream>
+#include"hourly.hpp"
+
+int Hourly::pay() {
+  return (payrate * hours);
+}
diff --git a/cpp/cpp1/staff/hourly.hpp b/cpp/cpp1/staff/hourly.hpp
@@ -0,0 +1,19 @@
+// Staff member - base class
+#ifndef HOURLY_HPP
+#define HOURLY_HPP
+#include"employee.hpp"
+
+class Hourly : public Employee {
+  private:
+    int hours;
+  public:
+    Hourly(std::string n, std::string a, std::string p, 
+              std::string s, int r, int h) :
+       Employee(n, a, p, s, r)
+    {
+       hours = h;
+    }
+
+  int pay();
+};
+#endif
diff --git a/cpp/cpp1/staff/makefile b/cpp/cpp1/staff/makefile
@@ -0,0 +1,20 @@
+CC=g++ 
+CPPFLAGS=--std=c++11 -Wall -pedantic
+
+all: staff.cpp staffmember.o employee.o salaried.o hourly.o
+	$(CC) $(CPPFLAGS) staff.cpp staffmember.o employee.o salaried.o hourly.o -o staff
+
+staffmember.o: staffmember.cpp
+	$(CC) $(CPPFLAGS) -c staffmember.cpp
+
+employee.o: employee.cpp
+	$(CC) $(CPPFLAGS) -c employee.cpp
+
+salaried.o: salaried.cpp
+	$(CC) $(CPPFLAGS) -c salaried.cpp
+
+hourly.o: hourly.cpp
+	$(CC) $(CPPFLAGS) -c hourly.cpp
+
+clean:
+	rm -f *.o *.exe
diff --git a/cpp/cpp1/staff/salaried.cpp b/cpp/cpp1/staff/salaried.cpp
@@ -0,0 +1,6 @@
+#include<iostream>
+#include"salaried.hpp"
+
+int Salaried::pay() {
+  return (payrate / 26);
+}
diff --git a/cpp/cpp1/staff/salaried.hpp b/cpp/cpp1/staff/salaried.hpp
@@ -0,0 +1,17 @@
+// Salaried employee
+#ifndef SALARIED_HPP
+#define SALARIED_HPP
+
+#include"employee.hpp"
+
+class Salaried : public Employee {
+  public:
+    Salaried(std::string n, std::string a, std::string p, 
+              std::string s, int r) :
+       Employee(n, a, p, s, r)
+    {
+    }
+
+  int pay();
+};
+#endif
diff --git a/cpp/cpp1/staff/staff.cpp b/cpp/cpp1/staff/staff.cpp
@@ -0,0 +1,41 @@
+// Adapted from an example from Java Foundations 
+//  by John Lewis, Peter DePasquale, & Joe Chase
+//
+#include<iostream>
+#include"staffmember.hpp"
+#include"salaried.hpp"
+#include"volunteer.hpp"
+#include"hourly.hpp"
+
+using namespace std;
+
+#define STAFF_SIZE  4
+
+void print_paystub(StaffMember * s) {
+  s->print();
+  cout << "Current pay : " << s->pay() << endl;
+}
+
+int main() {
+  int ii;
+  int totalpay = 0;
+  StaffMember * staff[STAFF_SIZE];
+  staff[0] = new Salaried("Bob Smith", "123 Main", "480-555-8765", 
+                           "111-22-3333", 50000);
+  staff[1] = new Volunteer("Alice Jenkins", "456 4th", "480-555-2341");
+  staff[2] = new Hourly("Mitch Jenkins", "456 4th", "480-555-2341", 
+                          "222-33-2222", 10, 40);
+  staff[3] = new Salaried("John Franklin", "222 Bank", "480-555-2343", 
+                           "111-22-4444", 78000);
+
+  for(ii=0;ii<STAFF_SIZE;ii++)  {
+    cout <<"\nEmployee " << ii << ": " << endl;
+    print_paystub(staff[ii]);
+    totalpay=totalpay + staff[ii]->pay();
+  }
+
+  cout << "\nTotal payroll: " << totalpay << endl; 
+  cout << "Done!" << endl;  
+
+  return 0;
+}
diff --git a/cpp/cpp1/staff/staffmember.cpp b/cpp/cpp1/staff/staffmember.cpp
@@ -0,0 +1,11 @@
+#include<iostream>
+#include"staffmember.hpp"
+
+using namespace std;
+
+void StaffMember::print() {
+  cout << "    Name: " << name << endl;
+  cout << " Address: " << address << endl;
+  cout << "   Phone: " << phone << endl;
+}
+
diff --git a/cpp/cpp1/staff/staffmember.hpp b/cpp/cpp1/staff/staffmember.hpp
@@ -0,0 +1,21 @@
+// Staff member - base class
+#ifndef STAFFMEMBER_HPP
+#define STAFFMEMBER_HPP
+
+class StaffMember {
+  private:
+    std::string name;
+    std::string address;
+    std::string phone;
+  
+  public: 
+    // Constructor
+    StaffMember(std::string n, std::string a, std::string p) {
+      name = n;
+      address = a;
+      phone = p;
+    }
+    void print();
+    virtual int pay() = 0;  // Abstract method
+};
+#endif
diff --git a/cpp/cpp1/staff/volunteer.hpp b/cpp/cpp1/staff/volunteer.hpp
@@ -0,0 +1,14 @@
+// Volunteer class
+#ifndef VOLUNTEER_HPP
+#define VOLUNTEER_HPP
+#include"employee.hpp"
+
+class Volunteer : public StaffMember{
+  public :
+    Volunteer(std::string n, std::string a, std::string p) : 
+       StaffMember(n, a, p)
+    {
+    }
+  int pay () { return 0; }
+};
+#endif
diff --git a/cpp/cpp2/destructors.cpp b/cpp/cpp2/destructors.cpp
diff --git a/cpp/cpp3/operatorovld.cpp b/cpp/cpp3/operatorovld.cpp
diff --git a/cpp/cpp4/friend.cpp b/cpp/cpp4/friend.cpp
diff --git a/cpp/cpp4/template.cpp b/cpp/cpp4/template.cpp
