end of 6.4

sortolavi · sortolavi · commit b17a51080ea8 · 2026-02-14T17:07:19.000+02:00
diff --git a/Work/Data/stocklog.csv b/Work/Data/stocklog.csv
diff --git a/Work/exercise6.02.py b/Work/exercise6.02.py
@@ -24,23 +24,22 @@ def printtaa():
 
 # printtaa()
 
-def filematch(filename, substr):
-    with open(filename, 'r') as f:
-        for line in f:
-            if substr in line:
-                yield line
+def filematch(lines, substr):
+    for line in lines:
+        if substr in line:
+            yield line
 
-# for line in open('.\\Data\\portfolio.csv'):
-#     print(line, end='')
 
-f = filematch('.\\Data\\portfolio.csv', 'IBM')
-# print(f)
-# print(f.__next__(), end='')
-# print(f.__next__(), end='')
+from follow import follow
 
-for line in f:
-    print(line, end='')
+lines = follow('.\\Data\\stocklog.csv')
+# ibm = filematch(lines, 'IBM')
+# for line in ibm:
+#     print(line)
 
+import csv
+
+rows = csv.reader(lines)
+for row in rows:
+    print(row)
 
-# for line in filematch('.\\Data\\portfolio.csv', 'IBM'):
-#     print(line, end='')
diff --git a/Work/follow.py b/Work/follow.py
@@ -1,10 +1,14 @@
-
+# follow.py
 import os
 import time
-import report
+
 
 def follow(filename):
+    '''
+    Generator function to produce data for consumers
     
+    :param filename: file to read latest data added to the bottom
+    '''
     f = open(filename)
     f.seek(0, os.SEEK_END)   # Move file pointer 0 bytes from end of file
 
@@ -19,7 +23,7 @@ def follow(filename):
 
 
 if __name__ == '__main__':
-
+    import report
     portfolio = report.read_portfolio('.\\Data\\portfolio.csv')
 
     for line in follow('.\\Data\\stocklog.csv'):
diff --git a/Work/portfolio.py b/Work/portfolio.py
@@ -15,12 +15,14 @@ def __getitem__(self, index): # usage: object[0], object[0:3]
         return self._holdings[index]
     
     def __contains__(self, name): # usage: 'IBM' in object ? True
-        return any([s.name == name for s in self._holdings])
+        # return any([s.name == name for s in self._holdings])
+        return any(s.name == name for s in self._holdings)
 
     
     @property
     def total_cost(self): # usage: object.total_cost
-        return sum([s.shares * s.price for s in self._holdings])
+        # return sum([s.shares * s.price for s in self._holdings])
+        return sum(s.shares * s.price for s in self._holdings)
 
 
     def tabulate_shares(self):
@@ -29,6 +31,7 @@ def tabulate_shares(self):
         total_shares = Counter()
         for s in self._holdings:
             total_shares[s.name] += s.shares
+
         return total_shares
 
 
diff --git a/Work/report.py b/Work/report.py
@@ -51,6 +51,9 @@ def make_report(portfolio, prices):
 def print_report(reportdata, formatter):
     '''
     Print a nicely formatted table from a list of (name, shares, price, change) tuples.
+    
+    :param reportdata: dictionary of data
+    :param formatter: Description
     '''
 
     formatter.headings(['Name','Shares','Price ($)','Change ($)'])
diff --git a/Work/ticker.py b/Work/ticker.py
@@ -0,0 +1,55 @@
+from follow import follow
+import csv
+import report
+import tableformat
+
+def select_columns(rows, indices):
+    for row in rows:
+        yield [row[index] for index in indices]
+
+def convert_types(rows, types):
+    for row in rows:
+        yield [func(val) for func, val in zip(types, row)]
+
+def make_dicts(rows, headers):
+    for row in rows:
+        yield dict(zip(headers, row))
+
+def filter_symbols(rows, names):
+    rows = (row for row in rows if row['name'] in names)
+    return rows
+    # for row in rows:
+    #     if row['name'] in names:
+    #         yield row
+
+def parse_stock_data(lines):
+    rows = csv.reader(lines)
+    rows = select_columns(rows, [0, 1, 4])
+    rows = convert_types(rows, [str, float, float])
+    rows = make_dicts(rows, ['name', 'price', 'change'])
+    return rows
+
+def ticker(pf_file, log_file, fmt):
+    portfolio = report.read_portfolio(pf_file)
+    lines = follow(log_file)
+    formatter = tableformat.create_formatter(fmt)
+
+    rows = parse_stock_data(lines)
+    rows = filter_symbols(rows, portfolio)
+    formatter.headings(['Name','Price ($)','Change ($)'])
+
+    for row in rows:
+        name = row['name']
+        price = row['price']
+        change = row['change']
+        rowdata = [ name, f'{price:0.2f}', f'{change:0.2f}' ]
+        formatter.row(rowdata)
+    
+
+
+if __name__ == '__main__':
+
+    ticker('.\\Data\\portfolio.csv', '.\\Data\\stocklog.csv', 'txt')
+
+
+
diff --git a/Work/using_portfolio.py b/Work/using_portfolio.py
@@ -11,6 +11,17 @@
 print('IBM' in portfolio)
 print('YIT' in portfolio)
 
+print(portfolio.total_cost)
+print(portfolio.tabulate_shares())
+
+holdings = portfolio.tabulate_shares()
+
+print(holdings.most_common(2))
+
+for h in holdings:
+    print(h, holdings[h])
+
+
 
 
 """ 
