Commit 0628a7ef authored by Mahesh Tripunitara's avatar Mahesh Tripunitara
Browse files

Merge branch 'master' of https://bitbucket.org/jshahen/vagabond into ReduceToCNFSAT

Conflicts:
	build.xml
parents d2471f03 7f7236d9
......@@ -8,5 +8,6 @@
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/circuit.jar"/>
<classpathentry kind="lib" path="lib/oplall.jar"/>
<classpathentry kind="lib" path="lib/commons-csv-1.3/commons-csv-1.3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -22,21 +22,10 @@ int p0[Machines,Clients]=...;
int r=...;
int t=ftoi(ceil(lg(r)));
int dMaxVal;
int dMaxVal=ftoi(pow(2,2*t-1)-1);
range tRange=0..t;
range zRange=0..t-1;
range ztRange=0..2*t;
int twoExp[ztRange];
execute
{
dMaxVal = Math.pow(2,2*t-1)-1;
for(var i in ztRange) {
twoExp[i] = Math.pow(2,i);
}
}
// NEW Placement of the Sum of Client VMs per Machine
dvar int p1[Machines,Clients] in 0..r;
......@@ -50,14 +39,14 @@ minimize
subject to {
// p1 represented as a value from p's bit form
forall(i in Clients, j in Machines)
p1[i,j] == sum(l in tRange) (twoExp[l] * p[i,j,l]);
forall(i in Clients, k in Machines)
p1[k,i] == sum(l in tRange) (pow(2,l) * p[k,i,l]);
// Bitwise AND for all pairs in p1
forall(k in Machines, c0 in Clients, c1 in Clients, u in tRange, v in tRange)
0 <= p[c0,k,u] + p[c1,k,v] - (2 * e[c0,c1,k,u,v]) <= 1;
0 <= p[k,c0,u] + p[k,c1,v] - (2 * e[c0,c1,k,u,v]) <= 1;
// Setting up values for d
forall(k in Machines, c0 in Clients, c1 in Clients, z in zRange)
d[c0,c1,k,z] == sum(l in zRange) (twoExp[z+l] *e[c0,c1,k,l,z]);
d[c0,c1,k,z] == sum(l in zRange) (pow(2,z+l) *e[c0,c1,k,l,z]);
// Capacity of servers respected
forall(k in Machines)
machineCapacity[k] >= sum(i in Clients) (p1[k,i]);
......@@ -66,8 +55,4 @@ subject to {
vmsPerClient[i] == sum(k in Machines) (p1[k,i]);
// Migration budget
2 * migrationBudget >= sum(i in Clients, k in Machines) ( abs(p1[k,i] - p0[k,i]) );
};
execute {
writeln("Optimal objective value="+cplex.getObjValue());
}
\ No newline at end of file
};
\ No newline at end of file
......@@ -3,8 +3,8 @@
<target name="javadoc">
<javadoc
access="private"
author="true"
classpath="lib/hamcrest-core-1.3.jar;lib/junit-4.12.jar;lib/commons-cli-1.2.jar;lib/commons-lang3-3.3.2.jar;lib/oplall.jar;lib/circuit.jar"
author="true"
classpath="lib/hamcrest-core-1.3.jar;lib/junit-4.12.jar;lib/commons-cli-1.2.jar;lib/commons-lang3-3.3.2.jar;lib/oplall.jar;lib/commons-csv-1.3/commons-csv-1.3.jar;lib/circuit.jar"
destdir="doc"
windowtitle="Vagabond API"
doctitle="Vagabond API"
......@@ -22,6 +22,7 @@
version="true">
<link href="http://docs.oracle.com/javase/8/docs/api/" />
<link href="https://commons.apache.org/proper/commons-csv/archives/1.3/apidocs/" />
<link offline="true" href="http://www.ibm.com/support/knowledgecenter/api/content/nl/en-us/SSSA5P_12.6.2/ilog.odms.ide.help/refjavaopl/html/" packagelistloc="lib/opl-javadoc/" />
<tag name="vagabond.category" description="Category:"/>
......
......@@ -22,21 +22,10 @@ int p0[Machines,Clients]=...;
int r=...;
int t=ftoi(ceil(lg(r)));
int dMaxVal;
int dMaxVal=ftoi(pow(2,2*t-1)-1);
range tRange=0..t;
range zRange=0..t-1;
range ztRange=0..2*t;
int twoExp[ztRange];
execute
{
dMaxVal = Math.pow(2,2*t-1)-1;
for(var i in ztRange) {
twoExp[i] = Math.pow(2,i);
}
}
// NEW Placement of the Sum of Client VMs per Machine
dvar int p1[Machines,Clients] in 0..r;
......@@ -50,14 +39,14 @@ minimize
subject to {
// p1 represented as a value from p's bit form
forall(i in Clients, j in Machines)
p1[i,j] == sum(l in tRange) (twoExp[l] * p[i,j,l]);
forall(i in Clients, k in Machines)
p1[k,i] == sum(l in tRange) (pow(2,l) * p[k,i,l]);
// Bitwise AND for all pairs in p1
forall(k in Machines, c0 in Clients, c1 in Clients, u in tRange, v in tRange)
0 <= p[c0,k,u] + p[c1,k,v] - (2 * e[c0,c1,k,u,v]) <= 1;
0 <= p[k,c0,u] + p[k,c1,v] - (2 * e[c0,c1,k,u,v]) <= 1;
// Setting up values for d
forall(k in Machines, c0 in Clients, c1 in Clients, z in zRange)
d[c0,c1,k,z] == sum(l in zRange) (twoExp[z+l] *e[c0,c1,k,l,z]);
d[c0,c1,k,z] == sum(l in zRange) (pow(2,z+l) *e[c0,c1,k,l,z]);
// Capacity of servers respected
forall(k in Machines)
machineCapacity[k] >= sum(i in Clients) (p1[k,i]);
......@@ -66,8 +55,4 @@ subject to {
vmsPerClient[i] == sum(k in Machines) (p1[k,i]);
// Migration budget
2 * migrationBudget >= sum(i in Clients, k in Machines) ( abs(p1[k,i] - p0[k,i]) );
};
execute {
writeln("Optimal objective value="+cplex.getObjValue());
}
\ No newline at end of file
};
\ No newline at end of file
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Apache Commons CSV
Copyright 2005-2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
src/main/resources/contract.txt
This file was downloaded from http://www.ferc.gov/docs-filing/eqr/soft-tools/sample-csv/contract.txt and contains neither copyright notice nor license.
src/main/resources/transaction.txt
This file was downloaded from http://www.ferc.gov/docs-filing/eqr/soft-tools/sample-csv/transaction.txt and contains neither copyright notice nor license.
src/test/resources/CSVFileParser/bom.csv
src/test/resources/CSVFileParser/test.csv
src/test/resources/CSVFileParser/test_default.txt
src/test/resources/CSVFileParser/test_default_comment.txt
src/test/resources/CSVFileParser/test_rfc4180.txt
src/test/resources/CSVFileParser/test_rfc4180_trim.txt
src/test/resources/CSVFileParser/testCSV85.csv
src/test/resources/CSVFileParser/testCSV85_default.txt
src/test/resources/CSVFileParser/testCSV85_ignoreEmpty.txt
These files are used as test data and test result specifications.
Apache Commons CSV
Version 1.3
Release Notes
INTRODUCTION:
This document contains the release notes for the 1.3 version of Apache Commons CSV.
Commons CSV reads and writes files in variations of the Comma Separated Value (CSV) format.
CSV requires at least Java 6.
The Apache Commons CSV library provides a simple interface for reading and writing
CSV files of various types.
Feature and bug fix release.
Changes in this version include:
NEW FEATURES
==============
o CSV-179: Add shortcut method for using first record as header to CSVFormat.
o CSV-180: Add withHeader(Class? extends Enum>) to CSVFormat.
o CSV-159: Add IgnoreCase option for accessing header names. Thanks to Yamil Medina.
o CSV-169: The null string should be case-sensitive when reading records. Thanks to Gary Gregory.
o CSV-175: Support for ignoring trailing delimiter. Thanks to Gary Gregory, Chris Jones.
o CSV-177: Support trimming leading and trailing blanks. Thanks to Gary Gregory.
o CSV-178: Create default formats for Informix UNLOAD and UNLOAD CSV. Thanks to Gary Gregory.
FIXED BUGS
============
o CSV-168: CSVFormat.nullString should not be escaped. Thanks to Gary Gregory, cornel creanga.
o CSV-170: CSVFormat.MYSQL nullString should be "\N". Thanks to Gary Gregory, cornel creanga.
o CSV-161: Fix Javadoc to say CSVFormat with() methods return a new CSVFormat. Thanks to Gary Gregory, Kristof Meixner, Emmanuel Bourg.
CHANGES
============
o CSV-167: Comment line hides next record; update Javadoc to make behaviour clear. Thanks to Rene.
o CSV-153: CSVPrinter doesn't skip creation of header record if skipHeaderRecord is set to true. Thanks to Wren.
Have fun!
-Apache Commons CSV team
------------------------------------------------------------------------------
Apache Commons CSV
Version 1.2
Release Notes
INTRODUCTION:
This document contains the release notes for the 1.2 version of Apache Commons CSV.
Commons CSV reads and writes files in variations of the Comma Separated Value (CSV) format.
CSV requires at least Java 6.
The Apache Commons CSV library provides a simple interface for reading and writing
CSV files of various types.
Feature and bug fix release
Changes in this version include:
NEW FEATURES
==============
o CSV-157: Add enum CSVFormat.Predefined that contains the default CSVFormat values.
FIXED BUGS
============
o CSV-145: CSVFormat.with* methods clear the header comments. Thanks to Frank Ulbricht.
o CSV-156: Incorrect Javadoc on QuoteMode.NONE. Thanks to Jason Steenstra-Pickens.
Historical list of changes: http://commons.apache.org/proper/commons-csv/changes-report.html
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
http://commons.apache.org/proper/commons-csv/
Have fun!
-Apache Commons CSV team
------------------------------------------------------------------------------
Apache Commons CSV
Version 1.1
Release Notes
INTRODUCTION:
This document contains the release notes for the 1.1 version of Apache Commons CSV.
Commons CSV reads and writes files in variations of the Comma Separated Value (CSV) format.
CSV requires at least Java 6.
The Apache Commons CSV library provides a simple interface for reading and writing
CSV files of various types.
This is our second release.
Changes in this version include:
New features:
o [CSV-129] Add CSVFormat#with 0-arg methods matching boolean arg methods.
o [CSV-131] Save positions of records to enable random access. Thanks to Holger Stratmann.
o [CSV-139] CSVPrinter.printRecord(ResultSet) with metadata.
Fixed Bugs:
o [CSV-140] QuoteMode.NON_NUMERIC doesn't work with CSVPrinter.printRecords(ResultSet). Thanks to Damjan Jovanovic.
o [CSV-130] CSVFormat#withHeader doesn't work well with #printComment, add withHeaderComments(String...). Thanks to Sergei Lebedev.
o [CSV-128] CSVFormat.EXCEL should ignore empty header names.
o [CSV-132] Incorrect Javadoc referencing org.apache.commons.csv.CSVFormat withQuote(). Thanks to Sascha Szott.
Changes:
o [CSV-124] Improve toString() implementation of CSVRecord. Thanks to Kalyan.
o [CSV-134] Unified parameter validation. Thanks to wu wen.
Historical list of changes: http://commons.apache.org/proper/commons-csv/changes-report.html
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
http://commons.apache.org/proper/commons-csv/
Have fun!
-Apache Commons CSV team
-------------------------------------------------------------------------------
Apache Commons CSV
Version 1.0
Release Notes
INTRODUCTION:
This document contains the release notes for the 1.0 version of Apache Commons CSV.
Commons CSV reads and writes files in variations of the Comma Separated Value (CSV) format.
CSV requires at least Java 6.0.
The Apache Commons CSV library provides a simple interface for reading and writing
CSV files of various types.
First release
Changes in this version include:
NEW FEATURES
============
o CSV-121: IllegalArgumentException thrown when the header contains duplicate names when the column names are empty.
Thanks to Sebastian Hardt.
o CSV-120: CSVFormat#withHeader doesn't work with CSVPrinter Thanks to Sergei Lebedev.
o CSV-119: CSVFormat is missing a print(...) method Thanks to Sergei Lebedev.
o CSV-105: Add Map conversion API to CSVRecord
o CSV-52: Keep track of record number
o CSV-92: Need a way to extract parsed headers, e.g. for use in formatting
output
o CSV-65: Header support
o CSV-48: Predefined format for MYSQL
FIXED BUGS
==========
o CSV-125: No longer works with Java 6
o CSV-122: NullPointerException when empty header string and and null string of "".
Thanks to Mike Lewis.
o CSV-118: CSVRecord.toMap() throws NPE on formats with no
headers. Thanks to Enrique Lara.
o CSV-113: Check whether ISE/IAE are being used appropriately
o CSV-114: CSVFormat constructor should reject a header array with duplicate
entries
o CSV-112: HeaderMap is inconsistent when it is parsed from an input with
duplicate columns names
o CSV-111: CSVRecord.toMap() fails if row length shorter than header length
o CSV-106: CSVFormat.format allways append null
o CSV-100: CSVParser: getHeaderMap throws NPE
o CSV-53: CSVRecord does not verify that the length of the header mapping
matches the number of values
o CSV-54: Confusing semantic of the ignore leading/trailing spaces parameters
o CSV-34: CSVFormat describes itself as immutable, but it is not - in
particular it is not thread-safe
o CSV-36: Endless loops in CSV parser
o CSV-13: NullPointerException in CSVPrinter.print()/println()
o CSV-23: Excel strategy uses wrong separator
CHANGES
=======
o CSV-117: Validate format parameters in constructor
o CSV-42: Lots of possible changes Thanks to Bob Smith.
o CSV-78: Use Character instead of char for char fields except delimiter
o CSV-99: Revert Builder implementation in CSVFormat
o CSV-93: Allow the handling of NULL values
o CSV-68: Use the Builder pattern for CSVFormat
o CSV-84: Clarify comment handling
o CSV-25: CSVParser.nextValue() seems pointless
o CSV-97: Allow the String value for null to be customized for the CSV
printer
o CSV-88: Not possible to create a CSVFormat from scratch
o CSV-94: Lexer should only use char fields
o CSV-71: Add convenience methods to CSVLexer
o CSV-59: Is CharBuffer really needed, now that StringBuilder is available?
o CSV-55: Replace while(true)-loop in CSVParser.getRecord with do-while-loop
o CSV-45: CSVPrinter overhaul
o CSV-49: CSVStrategy has modifiable public static variables Thanks to Bob Smith.
o CSV-46: Reduce visibility of methods in internal classes
o CSV-26: ExtendedBufferedReader does too much
o CSV-27: Decide whether to keep the csv.writer subpackage
Historical list of changes: http://commons.apache.org/proper/commons-csv/changes-report.html
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
http://commons.apache.org/proper/commons-csv/
Have fun!
-Apache Commons CSV team
Please direct all logs to go into this folder so that they do not accidently get added into the repo.
\ No newline at end of file
Please direct all logs to go into this folder so that they do not accidentally get added into the repo.
\ No newline at end of file
Please direct all stats to go into this folder so that they do not accidentally get added into the repo.
\ No newline at end of file
......@@ -92,7 +92,14 @@ public class VagabondCUI {
public static void printCommonCommands() {
System.out.println("\n\n--- Common Commands ---");
System.out.println("-settings tests/simpletest.properties !exit");
System.out.println("-loglevel verbose -settings tests/simpletest.properties !exit");
System.out.println("-loglevel verbose -settings tests/simpletestILP-Random.properties !exit");
System.out.println("-loglevel verbose -settings tests/simpletestILP-NomadSubOptimal.properties !exit");
System.out.println("-loglevel verbose -settings tests/equalSpread_10.properties !exit");
System.out.println("");
System.out.println("-loglevel verbose -settings tests/simpletestILP-NomadSubOptimal.properties !exit");
System.out.println("-noplacementmaps -loglevel verbose "
+ "-settings tests/simpletestILP-NomadSubOptimal.properties !exit");
System.out.println("");
try {
BufferedReader bfr = new BufferedReader(new FileReader(previousCommandFilename));
......
......@@ -26,6 +26,8 @@ import vagabond.reduction.ilp.RunSolverILP;
import vagabond.reduction.nomad.ReduceToNomad;
import vagabond.reduction.nomad.RunSolverNomad;
import vagabond.singleton.VagabondSettings;
import vagabond.testing.PlacementMapExamples;
import vagabond.timing.StatisticsManager;
import vagabond.timing.TimingManager;
/**
......@@ -47,6 +49,8 @@ public class VagabondInstance {
// Timer
public TimingManager timing = null;
public StatisticsManager stats = null;
// Helpers
private VagabondSettings settings = VagabondSettings.getInstance();
......@@ -65,6 +69,7 @@ public class VagabondInstance {
// Setup the timing manager and start the total time
timing = settings.timing;
stats = settings.stats;
/* Timing */timing.startTimer("totalTime");