tpajenka
							
						 
					 | 
					
						
						
							
						
						97942d5ee1
					 | 
					
						
						
							
							usarbeitung angefangen
						
						
						
						
						
						
					 | 
					
						2014-02-03 14:47:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						d04313c4be
					 | 
					
						
						
							
							misc stuff
						
						
						
						
						
						
						
						- changed symlinks to better test-matrices
- added -fllvm to compiler-flags
- run gc-stats 
						
						
					 | 
					
						2014-01-14 12:59:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						3fb1264f5f
					 | 
					
						
						
							
							accelerated reading and parsing of adjacency matrix by directly creating a
						
						
						
						
						
						
						
						vector for each row 
						
						
					 | 
					
						2014-01-13 00:02:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						90eb036f22
					 | 
					
						
						
							
							added computation time measurement, parsing evaluated before calculating
						
						
						
						
						
						
					 | 
					
						2014-01-12 22:42:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						79fc923174
					 | 
					
						
						
							
							added strictness at correct spot
						
						
						
						
						
						
					 | 
					
						2014-01-12 13:37:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						9d839ecd74
					 | 
					
						
						
							
							cleared not needed dependencies, improved parseAttr (it now checks for NaN as
						
						
						
						
						
						
						
						well and is thus slower), added strict evaluation of parsed data
structures 
						
						
					 | 
					
						2014-01-12 13:33:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						940cf72b05
					 | 
					
						
						
							
							removed Text dependency, parsing only via ByteString (and String). Just
						
						
						
						
						
						
						
						slightly faster than the previous version. 
						
						
					 | 
					
						2014-01-11 19:59:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						d48b955ebe
					 | 
					
						
						
							
							forgot to commit properties file
						
						
						
						
						
						
					 | 
					
						2014-01-06 10:58:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						afcfe59a2e
					 | 
					
						
						
							
							- added possibility to read parameter input file (alpha, omega, delta)
						
						
						
						
						
						
						
						TODO: documentation of specification
- if program parameters are specified -> use them; otherwise -> use "defaults" (sampledata.[...]) 
						
						
					 | 
					
						2014-01-05 22:12:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						887c6a8a43
					 | 
					
						
						
							
							added some haddock
						
						
						
						
						
						
					 | 
					
						2014-01-02 12:00:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						e7c73a33df
					 | 
					
						
						
							
							Attribute constraints matrix is updated by comparing min/max value of old matrix with attribute values of new node
						
						
						
						
						
						
					 | 
					
						2013-12-20 13:08:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						07d2d37bb6
					 | 
					
						
						
							
							nub -> ordNub (O(n^2) -> O(n log n))
						
						
						
						
						
						
						
						- included submodule with different approaches to perform nub in
  various surroundings. DOES NOT NEED TO BE COMPILED
- copied nubOrdBy to Util 
						
						
					 | 
					
						2013-12-18 11:36:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						daf87fd737
					 | 
					
						
						
							
							added ordnub-submodule with varying implementations
						
						
						
						
						
						
					 | 
					
						2013-12-18 11:12:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						fe7b575800
					 | 
					
						
						
							
							i accidentally factor 10..
						
						
						
						
						
						
					 | 
					
						2013-12-18 09:22:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						cad98f10cb
					 | 
					
						
						
							
							updateDensity slightly more efficient
						
						
						
						
						
						
					 | 
					
						2013-12-14 13:02:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						3cdb1d6d60
					 | 
					
						
						
							
							reduced version requirement for vector module
						
						
						
						
						
						
					 | 
					
						2013-12-09 12:01:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						1ec8de8ee2
					 | 
					
						
						
							
							made parallel
						
						
						
						
						
						
						
						some performance-data in main.hs.
Changes can be viewed in git.
TODO:
- Find out why there is overhed of >50% 
						
						
					 | 
					
						2013-12-09 01:51:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						9abbf0f508
					 | 
					
						
						
							
							completed sequential project. Testdata are looking right.
						
						
						
						
						
						
					 | 
					
						2013-12-03 15:04:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						726516cfb1
					 | 
					
						
						
							
							derped module-names
						
						
						
						
						
						
					 | 
					
						2013-12-03 11:38:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						f70e73f0d4
					 | 
					
						
						
							
							debugging.. split Module in more files
						
						
						
						
						
						
					 | 
					
						2013-12-03 11:36:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						56d6d29f3a
					 | 
					
						
						
							
							implemented step. Something is wrong with the 2nd expansion.. 1 Graph wont get created due to some constraint..
						
						
						
						
						
						
					 | 
					
						2013-12-03 02:44:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						1241394c3e
					 | 
					
						
						
							
							Merge branch 'master' of pwning.de:/hgraph
						
						
						
						
						
						
						
						Conflicts:
	src/DCB.hs 
						
						
					 | 
					
						2013-12-03 01:40:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						61d0868b0d
					 | 
					
						
						
							
							implemented more untested stuff
						
						
						
						
						
						
					 | 
					
						2013-12-03 01:39:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						c270736b95
					 | 
					
						
						
							
							Merge branch 'master' of pwning.de:/hgraph
						
						
						
						
						
						
						
						Conflicts:
	src/DCB.hs 
						
						
					 | 
					
						2013-12-03 01:16:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						52c3afa427
					 | 
					
						
						
							
							Haddock in DCB, unnötiges Argument in 'preprocess' entfern (density) und Haddock in Utils korrigiert
						
						
						
						
						
						
					 | 
					
						2013-12-03 01:06:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						03be3b4b5b
					 | 
					
						
						
							
							implemented addablePoints.. not tested, but type-checked :p
						
						
						
						
						
						
					 | 
					
						2013-12-03 00:22:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						03a34eac8e
					 | 
					
						
						
							
							fixed small bug with indices-vector
						
						
						
						
						
						
					 | 
					
						2013-12-02 22:56:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						9eda6c9165
					 | 
					
						
						
							
							Added Data for tests, found bugs..
						
						
						
						
						
						
					 | 
					
						2013-12-02 22:46:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						820c9f13d0
					 | 
					
						
						
							
							Wrote Output for Graph-Structure
						
						
						
						
						
						
					 | 
					
						2013-12-02 21:47:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						b761b7a26b
					 | 
					
						
						
							
							added Utils-Module wtih helper-Functions
						
						
						
						
						
						
					 | 
					
						2013-12-02 21:47:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						07d6aca36c
					 | 
					
						
						
							
							added debug, made createGraph more generic, changed Int8 to Int16 for testing
						
						
						
						
						
						
					 | 
					
						2013-12-01 19:46:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						a3228188e5
					 | 
					
						
						
							
							added bang-patterns, added more ghc-flags
						
						
						
						
						
						
					 | 
					
						2013-12-01 19:25:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						4b552083e6
					 | 
					
						
						
							
							Dimension von testDivergence korrigiert
						
						
						
						
						
						
					 | 
					
						2013-12-01 17:22:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						cc2e3fd21c
					 | 
					
						
						
							
							test now uses a rudimentary preprocessor
						
						
						
						
						
						
					 | 
					
						2013-12-01 17:20:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						aedbc0af15
					 | 
					
						
						
							
							testDivergence an "echte" Testdaten angepasst
						
						
						
						
						
						
					 | 
					
						2013-12-01 17:17:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						f814020d5a
					 | 
					
						
						
							
							Merge branch 'master' of pwning.de:/hgraph
						
						
						
						
						
						
					 | 
					
						2013-12-01 16:56:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						5f5f9ff64a
					 | 
					
						
						
							
							fixed haddock, formatting stuff
						
						
						
						
						
						
					 | 
					
						2013-12-01 16:55:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						3f085fa933
					 | 
					
						
						
							
							Fehlerkorrektur Vorverarbeitung
						
						
						
						
						
						
					 | 
					
						2013-12-01 16:55:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						8b9e5db2bd
					 | 
					
						
						
							
							more haddock, rewrote graph-parser
						
						
						
						
						
						
					 | 
					
						2013-12-01 16:37:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						e45d846237
					 | 
					
						
						
							
							added doc to .gitignore - invoke "cabal haddock --executables" for up2date documentation
						
						
						
						
						
						
					 | 
					
						2013-12-01 15:37:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						b0e3c3df28
					 | 
					
						
						
							
							some haddoc
						
						
						
						
						
						
					 | 
					
						2013-12-01 15:29:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						e4ef3d95cb
					 | 
					
						
						
							
							formatted, added haddoc for some functions
						
						
						
						
						
						
					 | 
					
						2013-11-29 20:42:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						27c67f8579
					 | 
					
						
						
							
							Merge branch 'master' of pwning.de:/hgraph
						
						
						
						
						
						
					 | 
					
						2013-11-29 20:35:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						101cca3496
					 | 
					
						
						
							
							Vorverarbeitung vollendet (ungetestet): unerfüllbare Kanten entfernen, Start-Seeds heraussuchen
						
						
						
						
						
						
					 | 
					
						2013-11-29 20:34:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						b68bed0160
					 | 
					
						
						
							
							formatted Main.hs
						
						
						
						
						
						
					 | 
					
						2013-11-29 20:11:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						fc0a836e65
					 | 
					
						
						
							
							Merge branch 'master' of pwning.de:/hgraph
						
						
						
						
						
						
					 | 
					
						2013-11-29 19:09:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						29a835ee46
					 | 
					
						
						
							
							Merge branch 'master' of pwning.de:/hgraph
						
						
						
						
						
						
					 | 
					
						2013-11-29 19:09:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						e6a81f3352
					 | 
					
						
						
							
							made createOutput more generic
						
						
						
						
						
						
						
						with modular item and line-seperator 
						
						
					 | 
					
						2013-11-29 19:09:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tpajenka
							
						 
					 | 
					
						
						
							
						
						8040f109e5
					 | 
					
						
						
							
							Funktionen zum Testen der Constraints/Density "gefüllt"
						
						
						
						
						
						
					 | 
					
						2013-11-29 19:09:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Dresselhaus
							
						 
					 | 
					
						
						
							
						
						43e6016fec
					 | 
					
						
						
							
							added more to .gitignore
						
						
						
						
						
						
					 | 
					
						2013-11-29 18:49:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |