| 
						
					 | 
					
						
						
							
						
						aa872f238a
					 | 
					
						
						
							
							testing for thread code
						
						
						
						
						
						
					 | 
					
						2012-11-22 23:12:08 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cff026fb17
					 | 
					
						
						
							
							Printing to log fix for Memory Management
						
						
						
						
						
						
					 | 
					
						2012-11-22 15:06:41 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3e716f5908
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/DjBushido/itcs3146-project
						
						
						
						
						
						
						
						Conflicts:
	memoryManagement.java 
						
						
					 | 
					
						2012-11-20 19:14:49 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b599237482
					 | 
					
						
						
							
							Completed most of best/worst fit algorithms
						
						
						
						
						
						
						
						Modified main class to run these algorithms
Signed-off-by: David Weber <djw612@gmail.com> 
						
						
					 | 
					
						2012-11-20 19:03:08 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						621b786bdc
					 | 
					
						
						
							
							Updated MemoryManagement for all algorithms
						
						
						
						
						
						
					 | 
					
						2012-11-20 19:08:09 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6e1a8b634
					 | 
					
						
						
							
							Add synchronization to dpturnbull's code
						
						
						
						
						
						
					 | 
					
						2012-11-17 11:37:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						afc1ffcf54
					 | 
					
						
						
							
							-Added more testing code for best fit
						
						
						
						
						
						
					 | 
					
						2012-11-17 05:07:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f0213a37a4
					 | 
					
						
						
							
							-Added code to allocate best fit and worst fit
						
						
						
						
						
						
					 | 
					
						2012-11-17 02:24:16 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0928f69c77
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/DjBushido/itcs3146-project
						
						
						
						
						
						
					 | 
					
						2012-11-17 02:00:35 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a468512e16
					 | 
					
						
						
							
							Debugging code
						
						
						
						
						
						
					 | 
					
						2012-11-17 00:33:09 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						51aad5ee74
					 | 
					
						
						
							
							Finish bugfixing for threaded allocation algorithm.
						
						
						
						
						
						
						
						Threaded allocation is now complete. 
						
						
					 | 
					
						2012-11-16 22:13:29 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						25fbca314c
					 | 
					
						
						
							
							Added code to run jobs
						
						
						
						
						
						
					 | 
					
						2012-11-16 13:01:41 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						616ef7b785
					 | 
					
						
						
							
							Tweaked algorithm
						
						
						
						
						
						
					 | 
					
						2012-11-14 23:54:24 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c062724071
					 | 
					
						
						
							
							Initial round of bugfixes to make program actually work
						
						
						
						
						
						
					 | 
					
						2012-11-13 17:22:47 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e80fda0c0
					 | 
					
						
						
							
							Flesh out the threaded algorithm
						
						
						
						
						
						
						
						Conflicts:
	memoryManagement.java 
						
						
					 | 
					
						2012-11-12 20:10:23 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3d022b276d
					 | 
					
						
						
							
							Added NextFit Algorithm
						
						
						
						
						
						
					 | 
					
						2012-11-12 15:38:37 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef42d9791f
					 | 
					
						
						
							
							Add in the reflection code for Jobs
						
						
						
						
						
						
					 | 
					
						2012-11-10 10:44:10 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c9cc6fc9ad
					 | 
					
						
						
							
							revised to remove System.out.print used to testing
						
						
						
						
						
						
					 | 
					
						2012-11-09 20:40:08 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a5abc7eeac
					 | 
					
						
						
							
							Revised to keep trying job until it loads
						
						
						
						
						
						
					 | 
					
						2012-11-09 20:30:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7051efa9cb
					 | 
					
						
						
							
							Added variable to set memory for Algorithms
						
						
						
						
						
						
					 | 
					
						2012-11-09 20:20:40 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f99f38c655
					 | 
					
						
						
							
							Revised to implement baseAlgorithm
						
						
						
						
						
						
					 | 
					
						2012-11-09 20:16:46 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						15efb51e4d
					 | 
					
						
						
							
							Updated memoryManagement
						
						
						
						
						
						
						
						Fixed minor bug 
						
						
					 | 
					
						2012-11-06 19:34:40 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f8a83cff2b
					 | 
					
						
						
							
							Updated memoryManagement
						
						
						
						
						
						
					 | 
					
						2012-11-06 19:31:05 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5af6502951
					 | 
					
						
						
							
							Remove another extra class file
						
						
						
						
						
						
					 | 
					
						2012-11-06 20:23:34 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dae7f74e81
					 | 
					
						
						
							
							Remove an extraneous class file
						
						
						
						
						
						
					 | 
					
						2012-11-06 20:16:47 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						004ee1a449
					 | 
					
						
						
							
							Fix up the basic errors in threadedAllocation
						
						
						
						
						
						
					 | 
					
						2012-11-06 20:15:58 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						43890ea1b9
					 | 
					
						
						
							
							Updated to include methods from base Algorithm
						
						
						
						
						
						
					 | 
					
						2012-11-06 19:15:05 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1525dc4d41
					 | 
					
						
						
							
							IDE Bug fixes, and don't commit IDE files
						
						
						
						
						
						
					 | 
					
						2012-11-06 20:12:32 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a466157d5f
					 | 
					
						
						
							
							Fix dumb errors in the dummyAlgorithm
						
						
						
						
						
						
					 | 
					
						2012-11-06 19:53:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						68bc6b8ba4
					 | 
					
						
						
							
							Added First Fit
						
						
						
						
						
						
					 | 
					
						2012-11-06 18:43:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f26a19a34a
					 | 
					
						
						
							
							Fix up threading code, add methods for calling deallocation
						
						
						
						
						
						
					 | 
					
						2012-11-06 13:33:20 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f9a9069e3b
					 | 
					
						
						
							
							Added BestFit and WorstFit class files
						
						
						
						
						
						
					 | 
					
						2012-11-05 21:08:12 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9588dda536
					 | 
					
						
						
							
							
						
						
						
						
						
						
					 | 
					
						2012-11-05 21:04:21 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6d140e9021
					 | 
					
						
						
							
							Add the dummy class, and clean up the base algorithm
						
						
						
						
						
						
					 | 
					
						2012-11-05 17:59:08 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2c9d884b78
					 | 
					
						
						
							
							Commit skeleton code for the threaded allocation class
						
						
						
						
						
						
					 | 
					
						2012-10-30 20:53:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af99b63284
					 | 
					
						
						
							
							Update the baseAlgorithm class
						
						
						
						
						
						
					 | 
					
						2012-10-30 20:26:34 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1fd7966e3b
					 | 
					
						
						
							
							Ignore Vim swap files
						
						
						
						
						
						
					 | 
					
						2012-10-30 20:23:15 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a1be9111fa
					 | 
					
						
						
							
							Add code for the Job itself
						
						
						
						
						
						
					 | 
					
						2012-09-28 18:07:28 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						470e720197
					 | 
					
						
						
							
							Tester, Job Class, BaseAlgorithm Parent
						
						
						
						
						
						
					 | 
					
						2012-09-25 21:29:00 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3cd83ce2d3
					 | 
					
						
						
							
							Initial commit
						
						
						
						
						
						
					 | 
					
						2012-09-25 17:47:37 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |