repo string | commit string | message string | diff string |
|---|---|---|---|
yasuhito/shortestpath | 31f2ee2b59be1b303050b153615e19358aff9b51 | ãã¼ããªã¹ããæå®ã§ããããã«ä¿®æ£ | diff --git a/queued.rb b/queued.rb
index de7eb34..dbf2a4b 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,135 +1,132 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
- def initialize
+ def ... |
yasuhito/shortestpath | 0600dbb3d3fc285e47c3fa33e5e0dc0e0f02428c | PNG ã scp ããããããããã«ãã¹ãå:ãã¹ã§åºåããããã«ä¿®æ£ | diff --git a/queued.rb b/queued.rb
index 4699920..de7eb34 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,131 +1,135 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
def initialize
@l... |
yasuhito/shortestpath | a281c898789f72b3a9529a50c7bd0d9929b51cbb | OK ã®åºåãã¡ãã£ã¨å¤æ´ | diff --git a/queued.rb b/queued.rb
index 00d5358..4699920 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,134 +1,131 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
def initialize
@l... |
yasuhito/shortestpath | 8fc81686650a1d32aeec06600bef12067e5b04f8 | æçµææã® PNG ãã¹ãè¿ãããã«ä¿®æ£ | diff --git a/queued.rb b/queued.rb
index adab2d8..00d5358 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,129 +1,134 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
def initialize
@l... |
yasuhito/shortestpath | 8e451ef4fd9bea27f5805e87aeee383a8cfc3a66 | çµæã® PNG ãã¡ã¤ã«ãã¹ã表示ããããã«ä¿®æ£ | diff --git a/job.rb b/job.rb
index 3293c9a..da32218 100644
--- a/job.rb
+++ b/job.rb
@@ -1,109 +1,109 @@
require 'tempfile'
class Job
def initialize graph, source, destination
@source = source
@destination = destination
@graph = graph
validate
@ss = make_query_file
end
def co... |
yasuhito/shortestpath | fbfc65b6d023eeb2d37e5c77a560084cb1750d78 | ãããã« convert å¾ã® PNG ã®ãã¹ã表示ããããã«ãã¦ã¿ã | diff --git a/job.rb b/job.rb
index febb667..3293c9a 100644
--- a/job.rb
+++ b/job.rb
@@ -1,109 +1,109 @@
require 'tempfile'
class Job
def initialize graph, source, destination
@source = source
@destination = destination
@graph = graph
validate
@ss = make_query_file
end
def co... |
yasuhito/shortestpath | 13f4f073441291bba16b4ceb73a21439412e8fcf | SS ãã¡ã¤ã«ã®ã¹ãã¼ã¸ã³ã°ãããããã«ä¿®æ£ | diff --git a/command-builder.rb b/command-builder.rb
index 8166b92..69fac58 100644
--- a/command-builder.rb
+++ b/command-builder.rb
@@ -1,10 +1,10 @@
require 'job'
class CommandBuilder
def self.build node, graph, source, destination
job = Job.new( graph, source, destination )
- "ssh #{ node } '#{ job.... |
yasuhito/shortestpath | 550bad07e6972b820053de0e87e7b31d0db8cc19 | æå
¥ããã¸ã§ããééãã¦ããã®ã§ä¿®æ£ | diff --git a/job.rb b/job.rb
index c16dfcc..39faed4 100644
--- a/job.rb
+++ b/job.rb
@@ -1,109 +1,109 @@
require 'tempfile'
class Job
def initialize graph, source, destination
@source = source
@destination = destination
@graph = graph
validate
@ss = make_query_file
end
def co... |
yasuhito/shortestpath | 93af2ac54fbbf8877620f0dd52c6bd25e56e8aa6 | Job ã« command ã¡ã½ããã追å | diff --git a/command-builder.rb b/command-builder.rb
index c3764c2..8166b92 100644
--- a/command-builder.rb
+++ b/command-builder.rb
@@ -1,10 +1,10 @@
require 'job'
class CommandBuilder
def self.build node, graph, source, destination
job = Job.new( graph, source, destination )
- "ssh #{ node } #{ job.c... |
yasuhito/shortestpath | a910d4af1c66c001aee26760083bef3726040c03 | ã¨ã©ã¼æã®ã¡ãã»ã¼ã¸ãããããããæ¹å | diff --git a/queued.rb b/queued.rb
index 86a0074..adab2d8 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,129 +1,129 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
def initialize
@l... |
yasuhito/shortestpath | 3edd735646dfa2834381a71bd6fd59bf96596e24 | ãªã¯ã¨ã¹ããã¨ã«ã½ã±ããã close ããããã«ä¿®æ£ | diff --git a/queued.rb b/queued.rb
index 4db1fe7..86a0074 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,127 +1,129 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
def initialize
@l... |
yasuhito/shortestpath | f816d4dd25d787c8998b3c9c2f74ae6987b623ac | ã¨ã©ã¼æã®ããã¯ãã¬ã¼ã¹ããã°ã ãã«åºåããããã«ä¿®æ£ | diff --git a/queued.rb b/queued.rb
index c12d91d..4db1fe7 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,127 +1,127 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
def initialize
@l... |
yasuhito/shortestpath | 4414682f6407abda0b4c4e2287e9f03fb75b47fe | ã¨ã©ã¼ãèµ·ãã£ãå ´åã«ã¯ã©ã¤ã¢ã³ãã«ã¨ã©ã¼ãéä¿¡ããããã«ä¿®æ£ | diff --git a/queued.rb b/queued.rb
index 436cb0e..c12d91d 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,125 +1,127 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
def initialize
@l... |
yasuhito/shortestpath | 076dc6198ea6b8a3b2ad167e049b51be3d9b52e6 | ã³ãã³ããééãã¦ããã¨ãã®ã¨ã©ã¼å¦çã追å | diff --git a/queued.rb b/queued.rb
index 08aa35f..436cb0e 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,116 +1,125 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
def initialize
@l... |
yasuhito/shortestpath | 93f78ae61f31c4dd6d84936e4756031197c8d694 | ãã°åºåã追å | diff --git a/queued.rb b/queued.rb
index 480b3a9..08aa35f 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,118 +1,116 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
def initialize
@l... |
yasuhito/shortestpath | d830c303a0d5702f9ac5de6000de0704cf0396f2 | Queued éå§æã«ãã¹ãåãããªã³ãããããã«å¤æ´ | diff --git a/queued.rb b/queued.rb
index b36c430..480b3a9 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,118 +1,118 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
def initialize
@l... |
yasuhito/shortestpath | 13a54d4bbed69123e43713f7910093996403e138 | ãµã¼ãã®éå§ã表示ããããã«ãã | diff --git a/queued.rb b/queued.rb
index 2b02efd..b36c430 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,111 +1,118 @@
# -*- coding: utf-8 -*-
require 'command-builder'
require 'node-list'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
LOG_PATH = '/tmp/queued.log'
def initialize
@l... |
yasuhito/shortestpath | 1da722842f71af876f41573f302b920b4bfdd48d | Queued ã¯ã©ã¹ã®ãªãã¡ã¯ã¿ãªã³ã° | diff --git a/command-builder.rb b/command-builder.rb
new file mode 100644
index 0000000..c3764c2
--- /dev/null
+++ b/command-builder.rb
@@ -0,0 +1,10 @@
+require 'job'
+
+
+class CommandBuilder
+ def self.build node, graph, source, destination
+ job = Job.new( graph, source, destination )
+ "ssh #{ node } #{ job... |
yasuhito/shortestpath | 16dd545008fa4b0ba1ef7ac97208a75945333592 | convert ã®ã¸ã§ãã追å | diff --git a/queued.rb b/queued.rb
index e23717d..ecdd7fb 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,105 +1,105 @@
require 'job'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
def initialize
@log = File.open( '/tmp/queued.log', 'w' )
end
def start
socket = open_socket... |
yasuhito/shortestpath | 229f47cb915427be5503bdbb75e0f87f294fc264 | convert ã³ãã³ãã追å | diff --git a/job.rb b/job.rb
index 87e2281..deeafa7 100644
--- a/job.rb
+++ b/job.rb
@@ -1,93 +1,104 @@
require 'tempfile'
class Job
def initialize graph, source, destination
@source = source
@destination = destination
@graph = graph
validate
+ @ss = make_query_file
end
+ def c... |
yasuhito/shortestpath | 80858aafd0cede23f62c0e0fa2bef7bdfc576ab2 | ä¸æãã¡ã¤ã«ãäºåº¦ä½ãããåé¡ãä¿®æ£ | diff --git a/job.rb b/job.rb
index b8c441c..87e2281 100644
--- a/job.rb
+++ b/job.rb
@@ -1,93 +1,93 @@
require 'tempfile'
class Job
def initialize graph, source, destination
@source = source
@destination = destination
@graph = graph
validate
end
def sp_command
"/home/yasuhi... |
yasuhito/shortestpath | aa329477d91e30ec01d4726892eeadda9258e5bd | stderr ãã¯ã©ã¤ã¢ã³ãã¸ãªãã¤ã¬ã¯ãããããã«ä¿®æ£ | diff --git a/queued.rb b/queued.rb
index 55c7bbc..e23717d 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,105 +1,105 @@
require 'job'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
def initialize
@log = File.open( '/tmp/queued.log', 'w' )
end
def start
socket = open_socket... |
yasuhito/shortestpath | 71f216cc5f592d193c05f03fe2b163908c69f428 | stdout ãã¯ã©ã¤ã¢ã³ãã¸ãªãã¤ã¬ã¯ãããããã«ä¿®æ£ | diff --git a/queued.rb b/queued.rb
index 9b6a460..55c7bbc 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,105 +1,105 @@
require 'job'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
def initialize
@log = File.open( '/tmp/queued.log', 'w' )
end
def start
socket = open_socket... |
yasuhito/shortestpath | 147e49a8b845590bb00551f6dd751b214fd44c98 | Job ã new ããã¨ãã®å¼æ°ãã§ãã¯ã追å | diff --git a/job.rb b/job.rb
index c510691..b8c441c 100644
--- a/job.rb
+++ b/job.rb
@@ -1,70 +1,93 @@
require 'tempfile'
class Job
def initialize graph, source, destination
@source = source
@destination = destination
@graph = graph
- @ss = make_query_file
+ validate
end
- def co... |
yasuhito/shortestpath | 0b4010dafdda161f53e8d4a1431531305ef63cde | ss ãã¡ã¤ã«ã®ãã¹ãä¿®æ£ | diff --git a/job.rb b/job.rb
index aa6cd82..c510691 100644
--- a/job.rb
+++ b/job.rb
@@ -1,67 +1,70 @@
require 'tempfile'
class Job
def initialize graph, source, destination
@source = source
@destination = destination
@graph = graph
@ss = make_query_file
end
def command
"/h... |
yasuhito/shortestpath | 47936f39631e2bbf9ece49e7c9be9eb9b4384969 | å®è¡ããã³ãã³ãããã°ã«åãããã«ä¿®æ£ | diff --git a/queued.rb b/queued.rb
index 85c33d6..63ddeef 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,103 +1,105 @@
require 'job'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
def initialize
@log = File.open( '/tmp/queued.log', 'w' )
end
def start
socket = open_socket... |
yasuhito/shortestpath | d7aa1a95ade4e6909a09f2a84892ff975755f6ee | ã¨ãããããã¼ã¸ã¾ã§ãå®è£
ãã¦ã¿ã | diff --git a/job.rb b/job.rb
index 0e1cdc5..aa6cd82 100644
--- a/job.rb
+++ b/job.rb
@@ -1,46 +1,67 @@
require 'tempfile'
class Job
def initialize graph, source, destination
@source = source
@destination = destination
@graph = graph
+ @ss = make_query_file
end
def command
- "/h... |
yasuhito/shortestpath | 7330e20842d23c8d038fc50f8d60c649b16f3bf0 | sp.heap ã®ãã¹ããã¼ãã³ã¼ã | diff --git a/job.rb b/job.rb
index f7a7d69..0e1cdc5 100644
--- a/job.rb
+++ b/job.rb
@@ -1,46 +1,46 @@
require 'tempfile'
class Job
def initialize graph, source, destination
@source = source
@destination = destination
@graph = graph
end
- def command
- "sp.heap #{ @graph } #{ query... |
yasuhito/shortestpath | 180d53d206b2c5f08dd19593de05c2655d685f8d | ss ãã¡ã¤ã«ããã©ããä¿®æ£ | diff --git a/job.rb b/job.rb
index bbf5bec..f7a7d69 100644
--- a/job.rb
+++ b/job.rb
@@ -1,48 +1,46 @@
require 'tempfile'
class Job
def initialize graph, source, destination
@source = source
@destination = destination
@graph = graph
end
def command
"sp.heap #{ @graph } #{ query... |
yasuhito/shortestpath | a085e5f89c1a407ef9a4f5aeedde8b16a2256a7a | ss ãã¡ã¤ã«ã®ééããä¿®æ£ | diff --git a/job.rb b/job.rb
index 6b59369..bbf5bec 100644
--- a/job.rb
+++ b/job.rb
@@ -1,48 +1,48 @@
require 'tempfile'
class Job
def initialize graph, source, destination
@source = source
@destination = destination
@graph = graph
end
def command
"sp.heap #{ @graph } #{ query... |
yasuhito/shortestpath | 7ae3a632fae67f4a17d317cba7207b413bb4bcdf | require ãããããä¿®æ£ | diff --git a/queued.rb b/queued.rb
index d6c3477..84affb2 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,102 +1,103 @@
+require 'job'
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
def initialize
@log = File.open( '/tmp/queued.log', 'w' )
end
def start
socket = open_socket... |
yasuhito/shortestpath | ba9e0c4c4a1f7dfa2a3c906125007894e7ded0e7 | ãããã°ããªã³ãã追å | diff --git a/queued.rb b/queued.rb
index eaf07e2..d6c3477 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,100 +1,102 @@
require 'popen3'
require 'pshell'
class Queued
PORT = 7838
def initialize
@log = File.open( '/tmp/queued.log', 'w' )
end
def start
socket = open_socket
Kernel.... |
yasuhito/shortestpath | 6f963f45907badea04cf55f082de7bf5c0150df5 | ãããã°ããªã³ãã追å | diff --git a/queued.rb b/queued.rb
index 6675226..eaf07e2 100644
--- a/queued.rb
+++ b/queued.rb
@@ -1,98 +1,100 @@
require 'popen3'
require 'pshell'
class Queued
- PORT = 78383
+ PORT = 7838
def initialize
@log = File.open( '/tmp/queued.log', 'w' )
end
def start
socket = open_socket... |
yasuhito/shortestpath | 5a6afa72482879cc234e32e2c868d098a5058fec | Queued ãéå§ãã Rake ã¿ã¼ã²ããã追å | diff --git a/Rakefile b/Rakefile
index 1b20165..2bfb1b3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,32 +1,39 @@
require 'rubygems'
+require 'queued'
require 'rake/clean'
require 'spec'
require 'spec/rake/spectask'
require 'spec/rake/verify_rcov'
task :default => :verify_rcov
task :verify_rcov => :spec
RCov... |
thomaskern/heuropt_09 | 919ad1319794439d07727b943f6adb9cba2282f8 | docs changed | diff --git a/bsp2/docs/doc.aux b/bsp2/docs/doc.aux
index b781796..f9c9239 100644
--- a/bsp2/docs/doc.aux
+++ b/bsp2/docs/doc.aux
@@ -1,3 +1,7 @@
\relax
+\citation{1}
+\citation{2}
+\bibcite{1}{1}
\newlabel{table:gammaSSE}{{}{2}}
-\@writefile{lot}{\contentsline {table}{\numberline {1}{\ignorespaces $E(w,X)$ for diffe... |
thomaskern/heuropt_09 | 0644c657da82cd661ab38e931f63c0490a2f0f1f | doc changed | diff --git a/bsp2/out/production/bsp2/logic/Ant.class b/bsp2/out/production/bsp2/logic/Ant.class
index 3941295..825d2e5 100644
Binary files a/bsp2/out/production/bsp2/logic/Ant.class and b/bsp2/out/production/bsp2/logic/Ant.class differ
diff --git a/bsp2/src/logic/Ant.java b/bsp2/src/logic/Ant.java
index a9292a9..55c7d... |
thomaskern/heuropt_09 | fce139af1cd77b5d4e14602236d9045518f5147b | doc changed | diff --git a/bsp2/docs/doc.tex b/bsp2/docs/doc.tex
index cb5077e..5d6ec3d 100644
--- a/bsp2/docs/doc.tex
+++ b/bsp2/docs/doc.tex
@@ -1,56 +1,56 @@
\documentclass[12pt]{article}
\def\x#1#2{$\mathbb{#1}^#2$}
\def\n#1{\x#1}
\usepackage{graphicx}
\usepackage{latexsym}
\usepackage{amsfonts}
\usepackage{listings}
... |
thomaskern/heuropt_09 | e404365e65138b19aff4d682f4d054c9e41cc010 | logger added | diff --git a/bsp2/.gitignore b/bsp2/.gitignore
index c36d7e3..ad42da1 100644
--- a/bsp2/.gitignore
+++ b/bsp2/.gitignore
@@ -1,6 +1,7 @@
.idea/
*.class
dist/
*.aux
*.gz
-*.log
\ No newline at end of file
+*.log
+*.txt
\ No newline at end of file
diff --git a/bsp2/out/production/bsp2/data/tree/Trie.class b/bsp2/out... |
thomaskern/heuropt_09 | 503b97e146923588c572f148d389a7f0f7f71355 | logger added | diff --git a/bsp2/docs/doc.log b/bsp2/docs/doc.log
index 59ba82a..85455c4 100644
--- a/bsp2/docs/doc.log
+++ b/bsp2/docs/doc.log
@@ -1,204 +1,203 @@
-This is pdfTeXk, Version 3.1415926-1.40.9 (Web2C 7.5.7) (format=pdflatex 2009.10.30) 19 JAN 2010 13:33
+This is pdfTeXk, Version 3.1415926-1.40.9 (Web2C 7.5.7) (format=p... |
thomaskern/heuropt_09 | 7429dab4e7b46d8fb2d7c1e3679b05e885d24c6c | docs added | diff --git a/bsp2/.gitignore b/bsp2/.gitignore
index 8f905da..c36d7e3 100644
--- a/bsp2/.gitignore
+++ b/bsp2/.gitignore
@@ -1,3 +1,6 @@
.idea/
*.class
-dist/
\ No newline at end of file
+dist/
+*.aux
+*.gz
+*.log
\ No newline at end of file
diff --git a/bsp2/bsp2.iml b/bsp2/bsp2.iml
index 0bb572b..26cb450 100644
---... |
thomaskern/heuropt_09 | a575c8b4fc2b8aaf12929cd018b91736a4821a66 | lmax changed | diff --git a/bsp2/src/logic/search/RShrink.java b/bsp2/src/logic/search/RShrink.java
index 50158d9..366317f 100644
--- a/bsp2/src/logic/search/RShrink.java
+++ b/bsp2/src/logic/search/RShrink.java
@@ -1,174 +1,174 @@
package logic.search;
import data.tree.Trie;
import data.tree.TrieNode;
import data.tree.TrieNode... |
thomaskern/heuropt_09 | b2255ae9f46cfae27f995ad0bf2e75c2d494e7dd | played around | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
index fe06861..b6de23b 100644
--- a/bsp2/src/logic/AcoHBF.java
+++ b/bsp2/src/logic/AcoHBF.java
@@ -1,285 +1,296 @@
package logic;
import data.Edge;
import data.Graph;
import data.tree.Trie;
import data.tree.TrieList;
import data.tree.TrieNode... |
thomaskern/heuropt_09 | 392e85ca473ba7d8dfb73713a7f2c991156756d7 | vnd config changed | diff --git a/bsp2/src/logic/search/Vnd.java b/bsp2/src/logic/search/Vnd.java
index a81483f..8597066 100644
--- a/bsp2/src/logic/search/Vnd.java
+++ b/bsp2/src/logic/search/Vnd.java
@@ -1,26 +1,26 @@
package logic.search;
import data.tree.Trie;
public class Vnd implements ISearch {
public Trie run(Trie tre... |
thomaskern/heuropt_09 | dbacbc45f0c4848c4a4f85c8a322ba5e6e9f17c8 | master | diff --git a/bsp2/out/production/bsp2/logic/Ant.class b/bsp2/out/production/bsp2/logic/Ant.class
index b9b4bf4..10922ec 100644
Binary files a/bsp2/out/production/bsp2/logic/Ant.class and b/bsp2/out/production/bsp2/logic/Ant.class differ
|
thomaskern/heuropt_09 | 8d6e37130760b5377ce18b41311b3505eeeed781 | rshrink | diff --git a/bsp2/out/production/bsp2/logic/Ant.class b/bsp2/out/production/bsp2/logic/Ant.class
index 10922ec..b9b4bf4 100644
Binary files a/bsp2/out/production/bsp2/logic/Ant.class and b/bsp2/out/production/bsp2/logic/Ant.class differ
|
thomaskern/heuropt_09 | 4e33843442b71ad4fd11fd182f0376d1929aefa8 | renamed vnd | diff --git a/bsp2/out/production/bsp2/test/data/AcoTest.class b/bsp2/out/production/bsp2/test/data/AcoTest.class
index b89c913..678f8ae 100644
Binary files a/bsp2/out/production/bsp2/test/data/AcoTest.class and b/bsp2/out/production/bsp2/test/data/AcoTest.class differ
diff --git a/bsp2/src/logic/search/Vnd.java b/bsp2/... |
thomaskern/heuropt_09 | de5822bd46cd0b76de9cd1bad6d2cc97046e51cd | renamed acohbf | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
index 1e9a9c6..fe06861 100644
--- a/bsp2/src/logic/AcoHBF.java
+++ b/bsp2/src/logic/AcoHBF.java
@@ -1,285 +1,285 @@
package logic;
import data.Edge;
import data.Graph;
import data.tree.Trie;
import data.tree.TrieList;
import data.tree.TrieNode... |
thomaskern/heuropt_09 | 2dd7b55e2245561bdced62221447ca1ca11961a7 | premerge | diff --git a/bsp2/out/production/bsp2/test/data/AcoTest.class b/bsp2/out/production/bsp2/test/data/AcoTest.class
index 063b6aa..b89c913 100644
Binary files a/bsp2/out/production/bsp2/test/data/AcoTest.class and b/bsp2/out/production/bsp2/test/data/AcoTest.class differ
|
thomaskern/heuropt_09 | 800d7529b0c7b4d11587b377292038cfaf9c6663 | r shrink disconnected jetzt einfach r costliest nodes | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
index 185f257..7ad98fa 100644
--- a/bsp2/src/logic/AcoHBF.java
+++ b/bsp2/src/logic/AcoHBF.java
@@ -1,287 +1,287 @@
package logic;
import data.Edge;
import data.Graph;
import data.Node;
import data.NodeList;
import data.tree.Trie;
import data... |
thomaskern/heuropt_09 | d239bf1406283881be1662c34e8fc6593bc24d0e | scale for diagram changed | diff --git a/bsp2/out/production/bsp2/test/data/AcoTest.class b/bsp2/out/production/bsp2/test/data/AcoTest.class
index 4be1798..1d88d29 100644
Binary files a/bsp2/out/production/bsp2/test/data/AcoTest.class and b/bsp2/out/production/bsp2/test/data/AcoTest.class differ
diff --git a/bsp2/src/data/Graph.java b/bsp2/src/da... |
thomaskern/heuropt_09 | d6a1bd6f1e76305e21bd323a73c2b21df921ba6b | graph altered so that alpha and beta easily can be changed | diff --git a/bsp2/src/data/Graph.java b/bsp2/src/data/Graph.java
index e4d1b91..7020213 100644
--- a/bsp2/src/data/Graph.java
+++ b/bsp2/src/data/Graph.java
@@ -1,126 +1,134 @@
package data;
public class Graph {
private NodeList nodes;
private double[][] distance_matrix;
private double[][] pheromone_... |
thomaskern/heuropt_09 | 37bc94708454a169f95b0ff571f13fc128caf33c | ant changed | diff --git a/bsp2/out/production/bsp2/data/Graph.class b/bsp2/out/production/bsp2/data/Graph.class
index e27f3c4..58abf19 100644
Binary files a/bsp2/out/production/bsp2/data/Graph.class and b/bsp2/out/production/bsp2/data/Graph.class differ
diff --git a/bsp2/out/production/bsp2/logic/Ant.class b/bsp2/out/production/bsp... |
thomaskern/heuropt_09 | 9d01e35a86344219d88adfbb268e3680072eec37 | rhsrink cost debugged | diff --git a/bsp2/src/data/tree/TrieNode.java b/bsp2/src/data/tree/TrieNode.java
index c9fe41c..f268458 100644
--- a/bsp2/src/data/tree/TrieNode.java
+++ b/bsp2/src/data/tree/TrieNode.java
@@ -1,114 +1,118 @@
package data.tree;
import data.Node;
import java.util.Iterator;
import java.util.Stack;
public class T... |
thomaskern/heuropt_09 | 328e2111b57cd94e00e143a89c82a7f4e294395b | added logs | diff --git a/bsp2/logs/best/10.txt b/bsp2/logs/best/10.txt
new file mode 100644
index 0000000..76d9530
--- /dev/null
+++ b/bsp2/logs/best/10.txt
@@ -0,0 +1,518 @@
+Time used: 6125
+Time used: 3221
+Time used: 3859
+Time used: 5949
+Time used: 6477
+Time used: 4471
+Time used: 4596
+Time used: 5497
+Time used: 5033
+Tim... |
thomaskern/heuropt_09 | b09d1a9bb69116b6b0327e440a136e789e60e809 | comments | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
index 43a8269..185f257 100644
--- a/bsp2/src/logic/AcoHBF.java
+++ b/bsp2/src/logic/AcoHBF.java
@@ -1,267 +1,287 @@
package logic;
import data.Edge;
import data.Graph;
import data.Node;
import data.NodeList;
import data.tree.Trie;
import data... |
thomaskern/heuropt_09 | 37023fe3761d2f33bf5a595dca0349599353293b | ACOHFB Kib, Krb, Kbs Fehler debugged. Lag an division | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
index 5f26209..43a8269 100644
--- a/bsp2/src/logic/AcoHBF.java
+++ b/bsp2/src/logic/AcoHBF.java
@@ -1,270 +1,267 @@
package logic;
import data.Edge;
import data.Graph;
import data.Node;
import data.NodeList;
import data.tree.Trie;
import data... |
thomaskern/heuropt_09 | c8098f06f8ec1acf60d42e1620ed97cb3973e44a | ACOHFB Debugging. Was Kib Krb und Kbs angeht gibts nen Fehler... nach dem ersten Pheromone Update sind sie und bleiben sie 0 | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
index 5d0e7cd..5f26209 100644
--- a/bsp2/src/logic/AcoHBF.java
+++ b/bsp2/src/logic/AcoHBF.java
@@ -1,270 +1,270 @@
package logic;
import data.Edge;
import data.Graph;
import data.Node;
import data.NodeList;
import data.tree.Trie;
import data... |
thomaskern/heuropt_09 | 221251eb078253ae8eac6ac5e0aa7da993399f50 | ACOHFB erstes debugging | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
index f88e2a9..5d0e7cd 100644
--- a/bsp2/src/logic/AcoHBF.java
+++ b/bsp2/src/logic/AcoHBF.java
@@ -1,267 +1,270 @@
package logic;
import data.Edge;
import data.Graph;
import data.Node;
import data.NodeList;
import data.tree.Trie;
import data... |
thomaskern/heuropt_09 | df34da60b521a19f19c97d879370a5d9c734f171 | ACOHFB erstes debugging & Test hinzugefuegt | diff --git a/bsp2/src/test/data/AcoHBFTest.java b/bsp2/src/test/data/AcoHBFTest.java
new file mode 100644
index 0000000..2e2f6e0
--- /dev/null
+++ b/bsp2/src/test/data/AcoHBFTest.java
@@ -0,0 +1,35 @@
+package test.data;
+
+import data.Fixtures;
+import data.Graph;
+import data.tree.Trie;
+import logic.Aco;
+import log... |
thomaskern/heuropt_09 | bde16bd78f1aadad29cabb4fc69210169594da9c | ACOHFB erstes debugging | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
index c5373bd..f88e2a9 100644
--- a/bsp2/src/logic/AcoHBF.java
+++ b/bsp2/src/logic/AcoHBF.java
@@ -1,257 +1,267 @@
package logic;
import data.Edge;
import data.Graph;
import data.Node;
import data.NodeList;
import data.tree.Trie;
import data... |
thomaskern/heuropt_09 | 1e2ebfb9dde0dc8b61ed1672b6e3e13e646a8779 | ACOHFB finished | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
index 0ee11ad..c5373bd 100644
--- a/bsp2/src/logic/AcoHBF.java
+++ b/bsp2/src/logic/AcoHBF.java
@@ -1,187 +1,257 @@
package logic;
+import data.Edge;
import data.Graph;
import data.Node;
import data.NodeList;
import data.tree.Trie;
import data... |
thomaskern/heuropt_09 | b17d7b5a342087a8a969c177d801999e7820538a | output trie costs in integer | diff --git a/bsp2/out/production/bsp2/data/tree/Trie.class b/bsp2/out/production/bsp2/data/tree/Trie.class
index 73e26b5..1deaf8f 100644
Binary files a/bsp2/out/production/bsp2/data/tree/Trie.class and b/bsp2/out/production/bsp2/data/tree/Trie.class differ
diff --git a/bsp2/src/data/tree/Trie.java b/bsp2/src/data/tree/... |
thomaskern/heuropt_09 | c44d5751d782712486f46137a357741a49b342a2 | new project | diff --git a/bsp2/.idea/ant.xml b/bsp2/.idea/ant.xml
new file mode 100644
index 0000000..2581ca3
--- /dev/null
+++ b/bsp2/.idea/ant.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="AntConfiguration">
+ <defaultAnt bundledAnt="true" />
+ </component>
+</project>
... |
thomaskern/heuropt_09 | 698d508d4a0cedf4aac9cc37ccb3f19b99e0589c | gamma added to ACOHBF | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
index d255995..fd67438 100644
--- a/bsp2/src/logic/AcoHBF.java
+++ b/bsp2/src/logic/AcoHBF.java
@@ -1,176 +1,186 @@
package logic;
import data.Graph;
import data.Node;
+import data.NodeList;
import data.tree.Trie;
import data.tree.TrieList;
im... |
thomaskern/heuropt_09 | 1c11483128eb5890dcc731426da9aeb0305ffff1 | reversed order of probabilities | diff --git a/bsp2/out/production/bsp2/data/Graph.class b/bsp2/out/production/bsp2/data/Graph.class
index 65314b1..7c7a1a1 100644
Binary files a/bsp2/out/production/bsp2/data/Graph.class and b/bsp2/out/production/bsp2/data/Graph.class differ
diff --git a/bsp2/out/production/bsp2/logic/Aco.class b/bsp2/out/production/bsp... |
thomaskern/heuropt_09 | 46582cb0c2242dcb8dc485a34c59dfa7c3ae0df5 | acohbf errors fixed | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
index d255995..1a5b176 100644
--- a/bsp2/src/logic/AcoHBF.java
+++ b/bsp2/src/logic/AcoHBF.java
@@ -1,176 +1,176 @@
package logic;
import data.Graph;
import data.Node;
import data.tree.Trie;
import data.tree.TrieList;
import data.tree.TrieNode... |
thomaskern/heuropt_09 | e35506b766395e83c95e6759c6149191ee1e2e2c | ACOHFB added | diff --git a/bsp2/src/logic/AcoHBF.java b/bsp2/src/logic/AcoHBF.java
new file mode 100644
index 0000000..d255995
--- /dev/null
+++ b/bsp2/src/logic/AcoHBF.java
@@ -0,0 +1,176 @@
+package logic;
+
+import data.Graph;
+import data.Node;
+import data.tree.Trie;
+import data.tree.TrieList;
+import data.tree.TrieNode;
+impo... |
thomaskern/heuropt_09 | e4eb66c6fca888b9448fbb8b7e69ef22a61493ff | nh recalculated | diff --git a/bsp2/misc/nh_calculator.rb b/bsp2/misc/nh_calculator.rb
new file mode 100644
index 0000000..021ea3f
--- /dev/null
+++ b/bsp2/misc/nh_calculator.rb
@@ -0,0 +1,13 @@
+m = 13
+n = 20
+
+c = 0
+m.times do |t|
+ c += n - 1 - t
+end
+
+(m-1).times do |t|
+ c -= (t + 1)
+end
+
+puts c
\ No newline at end of fil... |
thomaskern/heuropt_09 | c18613a917484e81388e029cd7edf9983a78615f | nh recalculated | diff --git a/bsp2/out/production/bsp2/logic/Aco.class b/bsp2/out/production/bsp2/logic/Aco.class
index 3b87fc6..0067213 100644
Binary files a/bsp2/out/production/bsp2/logic/Aco.class and b/bsp2/out/production/bsp2/logic/Aco.class differ
diff --git a/bsp2/out/production/bsp2/logic/Ant.class b/bsp2/out/production/bsp2/lo... |
thomaskern/heuropt_09 | ce3406f817e3b0d5602f36786ce68b4d7b2502e6 | mit aco herumgespielt | diff --git a/bsp2/src/data/Graph.java b/bsp2/src/data/Graph.java
index 587eadb..e4d1b91 100644
--- a/bsp2/src/data/Graph.java
+++ b/bsp2/src/data/Graph.java
@@ -1,126 +1,126 @@
package data;
public class Graph {
private NodeList nodes;
private double[][] distance_matrix;
private double[][] pheromone_... |
thomaskern/heuropt_09 | 48f93f9e4e87040eb4e977227f8297f2d4984315 | ant nh changed | diff --git a/bsp2/out/production/bsp2/logic/Ant.class b/bsp2/out/production/bsp2/logic/Ant.class
index 48238db..ebe54fa 100644
Binary files a/bsp2/out/production/bsp2/logic/Ant.class and b/bsp2/out/production/bsp2/logic/Ant.class differ
diff --git a/bsp2/src/logic/Ant.java b/bsp2/src/logic/Ant.java
index 5877a42..030f1... |
thomaskern/heuropt_09 | cfbc06b7efbd79f7f53929a76a6b83b322308eb7 | heuristic | diff --git a/bsp2/src/logic/HeuristicValueEdgeSorter.java b/bsp2/src/logic/HeuristicValueEdgeSorter.java
new file mode 100644
index 0000000..d5603f4
--- /dev/null
+++ b/bsp2/src/logic/HeuristicValueEdgeSorter.java
@@ -0,0 +1,14 @@
+package logic;
+
+import data.Edge;
+
+import java.util.Comparator;
+
+public class Heur... |
thomaskern/heuropt_09 | 8434f204fc794a0de592c0540fbaf554dd57d532 | ant NH filtered by heuristic value | diff --git a/bsp2/out/production/bsp2/logic/Ant.class b/bsp2/out/production/bsp2/logic/Ant.class
index 7dc1522..48238db 100644
Binary files a/bsp2/out/production/bsp2/logic/Ant.class and b/bsp2/out/production/bsp2/logic/Ant.class differ
diff --git a/bsp2/out/production/bsp2/logic/Utility.class b/bsp2/out/production/bsp... |
thomaskern/heuropt_09 | 6cb8c018bab91cb8fff399d334dd7489580af203 | ant NH filtered by heuristic value | diff --git a/bsp2/out/production/bsp2/logic/Aco.class b/bsp2/out/production/bsp2/logic/Aco.class
index bf5f7b7..3b87fc6 100644
Binary files a/bsp2/out/production/bsp2/logic/Aco.class and b/bsp2/out/production/bsp2/logic/Aco.class differ
diff --git a/bsp2/src/logic/Aco.java b/bsp2/src/logic/Aco.java
index 95bca0a..5869f... |
thomaskern/heuropt_09 | eb7c5426827b21af2f2d37f30e5c2f428504937c | ant NH filtered by heuristic value | diff --git a/bsp2/out/production/bsp2/data/Edge.class b/bsp2/out/production/bsp2/data/Edge.class
index 61d3eae..a13d61b 100644
Binary files a/bsp2/out/production/bsp2/data/Edge.class and b/bsp2/out/production/bsp2/data/Edge.class differ
diff --git a/bsp2/out/production/bsp2/data/EdgeList.class b/bsp2/out/production/bsp... |
thomaskern/heuropt_09 | 980e76ef8df689b8c4eb0993f3c5f8f2e5de55ac | ant NH filtered by heuristic value | diff --git a/bsp2/out/production/bsp2/logic/Aco.class b/bsp2/out/production/bsp2/logic/Aco.class
index b5e07c3..6ed7753 100644
Binary files a/bsp2/out/production/bsp2/logic/Aco.class and b/bsp2/out/production/bsp2/logic/Aco.class differ
diff --git a/bsp2/out/production/bsp2/logic/Ant.class b/bsp2/out/production/bsp2/lo... |
thomaskern/heuropt_09 | 649b0833438feecd8505fcbe8482e1851d139a8f | removed useless comments | diff --git a/bsp2/src/logic/Aco.java b/bsp2/src/logic/Aco.java
index 4274720..2072fa2 100644
--- a/bsp2/src/logic/Aco.java
+++ b/bsp2/src/logic/Aco.java
@@ -1,176 +1,173 @@
package logic;
import data.Graph;
import data.Node;
import data.tree.Trie;
import data.tree.TrieList;
import data.tree.TrieNode;
import vi... |
thomaskern/heuropt_09 | f258884102c44e6b3edf64355c0a87cb9a19405c | modification collection bug in rshrink removed | diff --git a/bsp2/src/logic/Aco.java b/bsp2/src/logic/Aco.java
index 2024996..4274720 100644
--- a/bsp2/src/logic/Aco.java
+++ b/bsp2/src/logic/Aco.java
@@ -1,176 +1,176 @@
package logic;
import data.Graph;
import data.Node;
import data.tree.Trie;
import data.tree.TrieList;
import data.tree.TrieNode;
import vi... |
thomaskern/heuropt_09 | 8bead1979a938b477efd322fb6b55a3ebd28a34d | modification collection bug in rshrink removed | diff --git a/bsp2/out/production/bsp2/logic/Aco.class b/bsp2/out/production/bsp2/logic/Aco.class
index 232e8e4..b5e07c3 100644
Binary files a/bsp2/out/production/bsp2/logic/Aco.class and b/bsp2/out/production/bsp2/logic/Aco.class differ
diff --git a/bsp2/out/production/bsp2/logic/Ant.class b/bsp2/out/production/bsp2/lo... |
thomaskern/heuropt_09 | ef43f131572e779df6187e821baf0968ea881d15 | Rshrink debugged | diff --git a/bsp2/src/logic/search/RShrink.java b/bsp2/src/logic/search/RShrink.java
index 82ac208..085b2dc 100644
--- a/bsp2/src/logic/search/RShrink.java
+++ b/bsp2/src/logic/search/RShrink.java
@@ -1,145 +1,147 @@
package logic.search;
import data.Graph;
import data.tree.Trie;
import data.tree.TrieNode;
impor... |
thomaskern/heuropt_09 | d26ac2de072c963612e966f040032ff896e8ac45 | removed invalid rshrink from vnd | diff --git a/bsp2/out/production/bsp2/data/tree/Trie.class b/bsp2/out/production/bsp2/data/tree/Trie.class
index 3e0b7a2..cf4b542 100644
Binary files a/bsp2/out/production/bsp2/data/tree/Trie.class and b/bsp2/out/production/bsp2/data/tree/Trie.class differ
diff --git a/bsp2/out/production/bsp2/logic/Aco.class b/bsp2/ou... |
thomaskern/heuropt_09 | 7ca9bae98f65f66aee699cba4e4986e690ab0dcd | removed invalid rshrink from vnd | diff --git a/bsp2/out/production/bsp2/logic/Aco.class b/bsp2/out/production/bsp2/logic/Aco.class
index 95453db..d15d894 100644
Binary files a/bsp2/out/production/bsp2/logic/Aco.class and b/bsp2/out/production/bsp2/logic/Aco.class differ
diff --git a/bsp2/src/logic/Aco.java b/bsp2/src/logic/Aco.java
index 28df555..3cb40... |
thomaskern/heuropt_09 | e0183099143b344e622b963a1c6c71164f514416 | removed invalid rshrink from vnd | diff --git a/bsp2/out/production/bsp2/data/tree/Trie.class b/bsp2/out/production/bsp2/data/tree/Trie.class
index 7d26821..3e0b7a2 100644
Binary files a/bsp2/out/production/bsp2/data/tree/Trie.class and b/bsp2/out/production/bsp2/data/tree/Trie.class differ
diff --git a/bsp2/out/production/bsp2/logic/Aco.class b/bsp2/ou... |
thomaskern/heuropt_09 | d971b36f12f16afc153d352272ed5eaef2d3b1ea | Depth added to Trie. Vnd should work proper now. | diff --git a/bsp2/src/data/tree/Trie.java b/bsp2/src/data/tree/Trie.java
index fa8e991..f12b79d 100644
--- a/bsp2/src/data/tree/Trie.java
+++ b/bsp2/src/data/tree/Trie.java
@@ -1,160 +1,178 @@
package data.tree;
import data.Edge;
import data.Node;
import data.NodeList;
import java.util.Collection;
import java... |
thomaskern/heuropt_09 | 318aa7670a94cfc564c58c1434995059b115d89b | RShrink debugged | diff --git a/bsp2/src/logic/Ant.java b/bsp2/src/logic/Ant.java
index 5192d5b..e3c29e0 100644
--- a/bsp2/src/logic/Ant.java
+++ b/bsp2/src/logic/Ant.java
@@ -1,148 +1,148 @@
package logic;
import data.Edge;
import data.EdgeList;
import data.Graph;
import data.Node;
import data.tree.Trie;
import logic.search.Vnd... |
thomaskern/heuropt_09 | ccce74365b93961522ba31412439d80c6d37fe54 | removed graph in rshrink | diff --git a/bsp2/src/logic/search/RShrink.java b/bsp2/src/logic/search/RShrink.java
index 1812c16..981de42 100644
--- a/bsp2/src/logic/search/RShrink.java
+++ b/bsp2/src/logic/search/RShrink.java
@@ -1,144 +1,143 @@
package logic.search;
import data.Graph;
import data.tree.Trie;
import data.tree.TrieNode;
impor... |
thomaskern/heuropt_09 | d2df3b9db81face549d68783f99a1be92b093678 | RShrink debugged | diff --git a/bsp2/src/logic/search/RShrink.java b/bsp2/src/logic/search/RShrink.java
index 542294c..1812c16 100644
--- a/bsp2/src/logic/search/RShrink.java
+++ b/bsp2/src/logic/search/RShrink.java
@@ -1,142 +1,144 @@
package logic.search;
import data.Graph;
import data.tree.Trie;
import data.tree.TrieNode;
impor... |
thomaskern/heuropt_09 | 75e69a0fcfb357f7c90545ab568c43e4db68682c | RShrink finished so far | diff --git a/bsp2/src/logic/search/RShrink.java b/bsp2/src/logic/search/RShrink.java
index 1cbf6e8..542294c 100644
--- a/bsp2/src/logic/search/RShrink.java
+++ b/bsp2/src/logic/search/RShrink.java
@@ -1,145 +1,142 @@
package logic.search;
import data.Graph;
import data.tree.Trie;
import data.tree.TrieNode;
impor... |
thomaskern/heuropt_09 | 3b873ddf75dcb0f668cae69da2435f87735ca044 | rshrink method done | diff --git a/bsp2/src/data/tree/Trie.java b/bsp2/src/data/tree/Trie.java
index 7912933..fa8e991 100644
--- a/bsp2/src/data/tree/Trie.java
+++ b/bsp2/src/data/tree/Trie.java
@@ -1,159 +1,160 @@
package data.tree;
import data.Edge;
import data.Node;
import data.NodeList;
import java.util.Collection;
import java... |
thomaskern/heuropt_09 | 22b610218256d7de64f7d3b9810e0674c137b31f | rshrink method done | diff --git a/bsp2/src/data/tree/Trie.java b/bsp2/src/data/tree/Trie.java
index 2f48a49..7912933 100644
--- a/bsp2/src/data/tree/Trie.java
+++ b/bsp2/src/data/tree/Trie.java
@@ -1,159 +1,159 @@
package data.tree;
import data.Edge;
import data.Node;
import data.NodeList;
import java.util.Collection;
import java... |
thomaskern/heuropt_09 | 143bd8ba6332e1b5f23a9e0bb7d90908c283e77d | rshrink modifiziert | diff --git a/bsp2/src/logic/search/RShrink.java b/bsp2/src/logic/search/RShrink.java
index 9564695..2da4711 100644
--- a/bsp2/src/logic/search/RShrink.java
+++ b/bsp2/src/logic/search/RShrink.java
@@ -1,53 +1,63 @@
package logic.search;
import data.Graph;
import data.tree.Trie;
import data.tree.TrieNode;
import ... |
thomaskern/heuropt_09 | 954068724512923d026efeb8a09d2294f13f0fcf | foster parents added to rshrink | diff --git a/bsp2/src/logic/search/RShrink.java b/bsp2/src/logic/search/RShrink.java
index af2a275..9564695 100644
--- a/bsp2/src/logic/search/RShrink.java
+++ b/bsp2/src/logic/search/RShrink.java
@@ -1,63 +1,53 @@
package logic.search;
import data.Graph;
import data.tree.Trie;
import data.tree.TrieNode;
import ... |
thomaskern/heuropt_09 | a79e9f05939456f0d7ac5c52f95d105cc76e72fc | foster parents added to rshrink | diff --git a/bsp2/src/logic/search/RShrink.java b/bsp2/src/logic/search/RShrink.java
index a1863e8..af2a275 100644
--- a/bsp2/src/logic/search/RShrink.java
+++ b/bsp2/src/logic/search/RShrink.java
@@ -1,31 +1,63 @@
package logic.search;
import data.Graph;
import data.tree.Trie;
import data.tree.TrieNode;
import ... |
thomaskern/heuropt_09 | 656a72ab540554df8a7068b0206dd23fe57138a3 | TrieNode modifiziert so dass er descendants zurueck gibt | diff --git a/bsp2/src/data/tree/Trie.java b/bsp2/src/data/tree/Trie.java
index 56fceb0..2f48a49 100644
--- a/bsp2/src/data/tree/Trie.java
+++ b/bsp2/src/data/tree/Trie.java
@@ -1,158 +1,159 @@
package data.tree;
import data.Edge;
import data.Node;
import data.NodeList;
import java.util.Collection;
import java... |
thomaskern/heuropt_09 | fe908b6094fa8011d3dbee56cf984c361b101fc5 | refactored unused code | diff --git a/bsp2/src/data/tree/Trie.java b/bsp2/src/data/tree/Trie.java
index 2bc082c..56fceb0 100644
--- a/bsp2/src/data/tree/Trie.java
+++ b/bsp2/src/data/tree/Trie.java
@@ -1,159 +1,158 @@
package data.tree;
import data.Edge;
import data.Node;
import data.NodeList;
import java.util.Collection;
import java... |
thomaskern/heuropt_09 | 84a92c746c793061745d95152892ad9acf404d68 | bugfix sweep | diff --git a/bsp2/src/logic/Sweep.java b/bsp2/src/logic/Sweep.java
index e40b01b..d625104 100644
--- a/bsp2/src/logic/Sweep.java
+++ b/bsp2/src/logic/Sweep.java
@@ -1,134 +1,120 @@
package logic;
import data.tree.Trie;
import data.tree.TrieNode;
import data.tree.TrieNodeList;
import views.TrieVisualizer;
impo... |
thomaskern/heuropt_09 | 348902521d5208d41e1adb5ffbe53c42c1699d1a | bugfix sweep | diff --git a/bsp2/out/production/bsp2/data/tree/Trie.class b/bsp2/out/production/bsp2/data/tree/Trie.class
index 1a59ad0..4344886 100644
Binary files a/bsp2/out/production/bsp2/data/tree/Trie.class and b/bsp2/out/production/bsp2/data/tree/Trie.class differ
diff --git a/bsp2/out/production/bsp2/logic/Aco.class b/bsp2/ou... |
thomaskern/heuropt_09 | e426b9cc3f89693408023c60e9b7dddd9108ea45 | added root to sweep | diff --git a/bsp2/src/logic/Sweep.java b/bsp2/src/logic/Sweep.java
index ed44a2a..17ff67a 100644
--- a/bsp2/src/logic/Sweep.java
+++ b/bsp2/src/logic/Sweep.java
@@ -1,128 +1,128 @@
package logic;
import data.Edge;
import data.tree.Trie;
import data.tree.TrieNode;
import data.tree.TrieNodeList;
import java.uti... |
thomaskern/heuropt_09 | cb2825280adf891607799560f0f37283f39c2a96 | changed idea of sweep | diff --git a/bsp2/src/logic/Sweep.java b/bsp2/src/logic/Sweep.java
index 8c7190e..ed44a2a 100644
--- a/bsp2/src/logic/Sweep.java
+++ b/bsp2/src/logic/Sweep.java
@@ -1,113 +1,128 @@
package logic;
import data.Edge;
import data.tree.Trie;
import data.tree.TrieNode;
import data.tree.TrieNodeList;
-import views.Trie... |
thomaskern/heuropt_09 | 776a2011ac2983053b27a0f3b870309e64a9776c | scale for visualizer | diff --git a/bsp2/out/production/bsp2/logic/Ant.class b/bsp2/out/production/bsp2/logic/Ant.class
index 115d3f4..0dadda4 100644
Binary files a/bsp2/out/production/bsp2/logic/Ant.class and b/bsp2/out/production/bsp2/logic/Ant.class differ
diff --git a/bsp2/src/logic/Sweep.java b/bsp2/src/logic/Sweep.java
index b889bf8..8... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.