Skip to content

Commit 86e7ec3

Browse files
author
Trever Hallock
committed
Added a reprsentation Set.
1 parent b48ada6 commit 86e7ec3

File tree

12 files changed

+618
-34
lines changed

12 files changed

+618
-34
lines changed

GeneticMOP/.cproject

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<option id="gnu.cpp.compiler.option.include.paths.268234461" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
2727
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Rtree/src}&quot;"/>
2828
</option>
29-
<option id="gnu.cpp.compiler.option.include.files.802319143" name="Include files (-include)" superClass="gnu.cpp.compiler.option.include.files" valueType="includeFiles"/>
29+
<option id="gnu.cpp.compiler.option.include.files.802319143" name="Include files (-include)" superClass="gnu.cpp.compiler.option.include.files"/>
3030
<option id="gnu.cpp.compiler.option.dialect.std.1290465965" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" value="gnu.cpp.compiler.dialect.default" valueType="enumerated"/>
3131
<option id="gnu.cpp.compiler.option.other.other.344620313" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0" valueType="string"/>
3232
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1182998024" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
@@ -38,8 +38,11 @@
3838
</tool>
3939
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.737594647" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
4040
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1009963418" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
41-
<option id="gnu.cpp.link.option.paths.213318320" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths"/>
42-
<option id="gnu.cpp.link.option.libs.23881439" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs"/>
41+
<option id="gnu.cpp.link.option.paths.213318320" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths"/>
42+
<option id="gnu.cpp.link.option.libs.23881439" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
43+
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="&quot;${workspace_loc:/out/lib/libQTree.a}&quot;"/>
44+
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="&quot;${workspace_loc:/out/lib/libRepresenter.a}&quot;"/>
45+
</option>
4346
<option id="gnu.cpp.link.option.userobjs.632112333" name="Other objects" superClass="gnu.cpp.link.option.userobjs" valueType="userObjs">
4447
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Rtree/qtree.a}&quot;"/>
4548
</option>

GeneticMOP/src/GeneticMOP.cpp

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,15 @@
66
// Description : Hello World in C++, Ansi-style
77
//============================================================================
88

9-
#include <iostream>
109
using namespace std;
1110

12-
#include<limits.h>
13-
14-
#include <stdio.h>
15-
16-
#include "math_functions.h"
17-
18-
#include "VectorImageSet.h"
19-
#include "GeneticSolver.h"
20-
#include "RandomSampleSolver.h"
21-
#include "IncrementalSampleSolver.h"
22-
#include "DepthFirstRecursiveStencil.h"
23-
24-
11+
#include "common.h"
2512

2613
double get_index(double r)
2714
{
2815
return r * r * r * r * r * r * r;
2916
}
3017

31-
32-
3318
int main()
3419
{
3520
long seed = time(NULL);

GeneticMOP/src/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
void test_nearest();
4242
void test_pareto_equivalence();
43-
static void compare_solvers();
43+
void compare_solvers();
4444

4545

4646
#endif /* COMMON_H */

0 commit comments

Comments
 (0)