Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Iteration for different heuristics & netlist generations #11

Merged
merged 59 commits into from
Dec 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
160f1fd
netlist 0 is aangepaste 1
theetje Nov 21, 2017
a0d18d2
Merge remote-tracking branch 'origin/development' into development
theetje Nov 24, 2017
11d1dbc
Merge remote-tracking branch 'origin/development' into development
theetje Nov 24, 2017
6be219e
Save new Branch
theetje Nov 24, 2017
b6a65e7
Netist_history() en aanpassing Netlist()
theetje Nov 28, 2017
c5d016d
nieuwe indeling netlist en core
theetje Nov 28, 2017
d7270cb
Merge branch 'netlist-order' into development
theetje Nov 28, 2017
1b79841
Merge pull request #9 from LennartJKlein/development
theetje Nov 28, 2017
bdcff29
Merge remote-tracking branch 'origin/development' into development
theetje Nov 28, 2017
968a3c0
Old core and class files back
theetje Nov 28, 2017
a3383e4
Created an environment for experimenting multiple times
LennartJKlein Dec 1, 2017
03331c7
Minor change
LennartJKlein Dec 1, 2017
ee582ef
temp save
theetje Dec 2, 2017
57a3c6d
Netlist_log
theetje Dec 3, 2017
1c77934
added dogstrings
JurreBrandsen1709 Dec 4, 2017
fd743ef
new dogstring meth
JurreBrandsen1709 Dec 4, 2017
b209eea
nieuwe classes en core
theetje Dec 4, 2017
fa3f299
Merge remote-tracking branch 'origin/netlist-order' into netlist-order
theetje Dec 4, 2017
c10445b
Create a new global class: solution
LennartJKlein Dec 4, 2017
a2e90cf
Merge two methods
LennartJKlein Dec 4, 2017
23938e2
added helpers.py
JurreBrandsen1709 Dec 4, 2017
b1a0bcc
Merge branch 'netlist-order' of https://github.com/LennartJKlein/chip…
JurreBrandsen1709 Dec 4, 2017
7b98402
Bug solved
LennartJKlein Dec 4, 2017
203e54a
Merge branch 'netlist-order' of github.com:LennartJKlein/chips-circui…
LennartJKlein Dec 4, 2017
1a7498e
merged plot and plot_paths
JurreBrandsen1709 Dec 4, 2017
ecedcac
Bugfixing solution class
LennartJKlein Dec 4, 2017
77538d4
Merge branch 'netlist-order' of github.com:LennartJKlein/chips-circui…
LennartJKlein Dec 4, 2017
99a562d
Class 'solution' working
LennartJKlein Dec 4, 2017
9c9ac10
tuple_value en sort_by_connection
theetje Dec 4, 2017
b05b24c
Merge remote-tracking branch 'origin/netlist-order' into netlist-order
theetje Dec 4, 2017
541b277
Kleine aanpassing
theetje Dec 4, 2017
1f9a500
Program has now loops for finding best netlist ánd cost-variables
LennartJKlein Dec 4, 2017
c5c932a
Better output options and results
LennartJKlein Dec 4, 2017
765baf1
Included netlist-adaptions in solution-loop
LennartJKlein Dec 4, 2017
a9e35fb
Better control on iteration steps / costs / weights
LennartJKlein Dec 4, 2017
76a5990
Merge remote-tracking branch 'origin/netlist-order' into netlist-order
theetje Dec 4, 2017
8d9d2d2
Merge branch 'netlist-order' of github.com:LennartJKlein/chips-circui…
LennartJKlein Dec 5, 2017
ab622cd
Combined work on netlist + solution class
LennartJKlein Dec 5, 2017
6a0ab72
Extra settings for A* costs
LennartJKlein Dec 5, 2017
417c35f
settings py in gitnore
JurreBrandsen1709 Dec 5, 2017
60abe82
Bugfixing ??
LennartJKlein Dec 5, 2017
5c5de3d
Merge branch 'netlist-order' of github.com:LennartJKlein/chips-circui…
LennartJKlein Dec 5, 2017
2c214f5
Trying to fix A* with variable cost weights
LennartJKlein Dec 5, 2017
9d52d22
Simpler counter board-iterations
LennartJKlein Dec 5, 2017
fedc513
Bug fixed: depth not calculating by minus but by plus
LennartJKlein Dec 5, 2017
9209715
Old code of thomas back for netlist order
LennartJKlein Dec 5, 2017
45a99a5
Inserted swap for problematic paths (not drawn)
LennartJKlein Dec 5, 2017
acf18f3
Insights in score and result
LennartJKlein Dec 5, 2017
937cbf5
Nieuwe __main__.py met aanpassingen classes
theetje Dec 5, 2017
6043f75
Merge remote-tracking branch 'origin/netlist-order' into netlist-order
theetje Dec 5, 2017
1fc80f5
Auto stash before merge of "netlist-order" and "origin/netlist-order"
theetje Dec 5, 2017
707c7a7
Repared to test this mottafokkah
LennartJKlein Dec 5, 2017
995323c
Merge branch 'netlist-order' of github.com:LennartJKlein/chips-circui…
LennartJKlein Dec 5, 2017
fa9b858
Updated the __main__ with new code
LennartJKlein Dec 5, 2017
530f98e
Round the "average" result method
LennartJKlein Dec 5, 2017
55eaf9c
Better prints. I guess
LennartJKlein Dec 5, 2017
8dd4c0a
Auto stash before merge of "netlist-order" and "origin/netlist-order"
theetje Dec 6, 2017
ebd0541
Commit developed branch to master
theetje Dec 6, 2017
4ffea83
Merge pull request #10 from LennartJKlein/netlist-order
theetje Dec 6, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.pyc
netlist.pyc
settings.py
49 changes: 49 additions & 0 deletions sample/__main__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
"""
core.py
Authors: - Jurre Brandsen
- Lennart Klein
- Thomas de Lange

Pathfinder will find the most efficient path between two gates on a board.
"""

import settings
import colors as CLR

from classes import Solution
from classes import Gates
from classes import Netlist

# Print program settings
print("")
print("Using netlist: " + CLR.GREEN + str(settings.FILE_NETLIST) + CLR.DEFAULT)
print("Using gates file: " + CLR.GREEN + str(settings.FILE_GATES) + CLR.DEFAULT)
print("Using pathfinding algorithm: " + CLR.GREEN + str(settings.PATH_ALGORITHM) + CLR.DEFAULT)
print("")

# Initiate a new netlist
netlist = Netlist(settings.FILE_NETLIST)
netlist.sort_by_connection()

# Initiate the gates
gates = Gates(settings.FILE_GATES, settings.SIGN_GATE, netlist)

#
# COMMANDS TO OPTIMIZE NETLIST HERE
#

# Initiate a new solution
solution = Solution()
solution.run(gates, netlist)

# Plot solution information
if settings.PLOT_SCORES:
solution.plot_scores()

# Plot solution information
if settings.PLOT_RESULTS:
solution.plot_results()

# Plot solution board
if settings.PLOT_BEST:
solution.plot_best()
Loading