diff --git a/Programming/WDWR/projekt/doc/graphics/ryzyko_dystrybuanta.png b/Programming/WDWR/projekt/doc/graphics/ryzyko_dystrybuanta.png index 40aa71d0..e2581f3d 100644 Binary files a/Programming/WDWR/projekt/doc/graphics/ryzyko_dystrybuanta.png and b/Programming/WDWR/projekt/doc/graphics/ryzyko_dystrybuanta.png differ diff --git a/Programming/WDWR/projekt/doc/graphics/ryzyko_zysk_wykres.png b/Programming/WDWR/projekt/doc/graphics/ryzyko_zysk_wykres.png index c627313b..5035082b 100644 Binary files a/Programming/WDWR/projekt/doc/graphics/ryzyko_zysk_wykres.png and b/Programming/WDWR/projekt/doc/graphics/ryzyko_zysk_wykres.png differ diff --git a/Programming/WDWR/projekt/doc/graphics/zysk_dystrybuanta.png b/Programming/WDWR/projekt/doc/graphics/zysk_dystrybuanta.png index 0e3c0e00..49e9dd79 100644 Binary files a/Programming/WDWR/projekt/doc/graphics/zysk_dystrybuanta.png and b/Programming/WDWR/projekt/doc/graphics/zysk_dystrybuanta.png differ diff --git a/Programming/WDWR/projekt/doc/main.pdf b/Programming/WDWR/projekt/doc/main.pdf index 37a95ab2..d5afb4a8 100644 Binary files a/Programming/WDWR/projekt/doc/main.pdf and b/Programming/WDWR/projekt/doc/main.pdf differ diff --git a/Programming/WDWR/projekt/doc/main.tex b/Programming/WDWR/projekt/doc/main.tex index aaf9c1b3..13c8eae0 100644 --- a/Programming/WDWR/projekt/doc/main.tex +++ b/Programming/WDWR/projekt/doc/main.tex @@ -1,4 +1,4 @@ -\documentclass[12pt,a4paper]{article} +\documentclass[a4paper]{article} \usepackage[utf8]{inputenc} \usepackage{amsmath} diff --git a/Programming/WDWR/projekt/graph.py b/Programming/WDWR/projekt/graph.py index 5863d4b2..ce747828 100644 --- a/Programming/WDWR/projekt/graph.py +++ b/Programming/WDWR/projekt/graph.py @@ -30,11 +30,13 @@ df = pd.read_csv(StringIO(data_str), sep=';') # Create the scatter plot plt.figure(figsize=(10, 6)) -plt.scatter(df['averageProfit'], df['riskMeasureGini'], alpha=0.7, s=50) +plt.scatter(df['averageProfit'], df['riskMeasureGini'], alpha=0.7, s=200) # Add labels and title -plt.xlabel('Przeciętny Zysk') -plt.ylabel('Ryzyko') +plt.xlabel('Przeciętny Zysk', fontsize=16) +plt.ylabel('Ryzyko', fontsize=16) +plt.xticks(fontsize=16) +plt.yticks(fontsize=16) # Add grid for better readability plt.grid(True, alpha=0.3) diff --git a/Programming/WDWR/projekt/graph2.py b/Programming/WDWR/projekt/graph2.py index cdae2518..24e29667 100644 --- a/Programming/WDWR/projekt/graph2.py +++ b/Programming/WDWR/projekt/graph2.py @@ -46,11 +46,13 @@ plt.plot(scenario1_sorted, y_values, 'b-o', label='Scenariusz 1', linewidth=2, m plt.plot(scenario2_sorted, y_values, 'g-s', label='Scenariusz 2', linewidth=2, markersize=4) plt.plot(scenario3_sorted, y_values, 'r-^', label='Scenariusz 3', linewidth=2, markersize=4) # Add labels and title -plt.xlabel('Przeciętny Zysk') -plt.ylabel('Odwrotna dystrybuanta') +plt.xlabel('Przeciętny Zysk', fontsize=16) +plt.ylabel('Odwrotna dystrybuanta', fontsize=16) +plt.xticks(fontsize=16) +plt.yticks(fontsize=16) plt.ylim(0, 1) # Set y-axis limits to cut off values outside 0-1 range plt.grid(True, alpha=0.3) -plt.legend() +plt.legend(fontsize=16) # Format the plot plt.tight_layout() diff --git a/Programming/WDWR/projekt/graph3.py b/Programming/WDWR/projekt/graph3.py index 836d93f4..5c2edd2d 100644 --- a/Programming/WDWR/projekt/graph3.py +++ b/Programming/WDWR/projekt/graph3.py @@ -38,11 +38,13 @@ plt.plot(scenario2_sorted, y_values, 'g-s', label='Scenariusz 2', linewidth=2, m plt.plot(scenario3_sorted, y_values, 'r-^', label='Scenariusz 3', linewidth=2, markersize=4) # Add labels and title -plt.xlabel('Ryzyko') -plt.ylabel('Odwrotna dystrybuanta') +plt.xlabel('Ryzyko', fontsize=16) +plt.ylabel('Odwrotna dystrybuanta', fontsize=16) +plt.xticks(fontsize=16) +plt.yticks(fontsize=16) plt.ylim(0, 1) # Set y-axis limits to cut off values outside 0-1 range plt.grid(True, alpha=0.3) -plt.legend() +plt.legend(fontsize=16) # Format the plot plt.tight_layout()