Skip to content

Commit

Permalink
Merge pull request #2 from Lessnic/develop
Browse files Browse the repository at this point in the history
16.1-beta
  • Loading branch information
Lessnic committed Aug 30, 2016
2 parents ee3cd59 + e91cf46 commit e83e693
Show file tree
Hide file tree
Showing 121 changed files with 21,861 additions and 939 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.gradle
.idea
/build
/build
/logs
24 changes: 19 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
# Computer and algorithm interaction simulation software (CAISS).
Simulation software contains inside its core implemented with respect to mathematical model
representations of architecture and algorithm. Intended for simulation their interactions and
listing results for optimization purposes. It, in addition, includes a few benchmarks to comparison
with a real performance with simulation results for improving and testing purposes.
The simulation software contains inside its core representations of
architecture and algorithm implemented with respect to a derived in
a related PhD thesis mathematical model. It intended for simulation
architecture and algorithm interactions and listing the results for
optimization purposes. It, in addition, includes a few benchmarks for
comparison a real performance with simulation results for improving and
testing purposes.

### Running in IDEA
Just select the runnable classes and run as a console Java application.
First - import the gradle project. Then select the desired runnable
class and run as a console Java application.
**benchmarks.ants.run.AntsRunner
benchmarks.matrixes.ManualBenchmarksRunner**

The next runnable needs a JMH plugin and annotations processing on.
**benchmarks.matrixes.JMHBenchmarksRunner**

### Running via Gradle
gradle -jmh command runs the
**benchmarks.matrixes.JMHBenchmarksRunner**
without additional settings.

# License
GNU GENERAL PUBLIC LICENSE Version 3.
19 changes: 16 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jmh.jmhVersion = "1.12"
// the main class where other test classes should be registered.
tasks.jmh.main = "benchmarks.control.JMHBenchmarksRunner"

//noinspection GroovyAssignabilityCheck - false, while it works don"t touch it
//noinspection GroovyAssignabilityCheck - false, while it works don't touch it
sourceSets {
main {
java {
Expand All @@ -59,15 +59,28 @@ jmhJar {
append "META-INF/CompilerHints"
}

task fatJar(type: Jar) {
manifest {
//noinspection GroovyAssignabilityCheck - false, while it works don't touch it
attributes "Main-Class": "benchmarks.ants.run.AntsRunner"
}
baseName = project.name + "-all"
from { configurations.compile.collect { it.directory ? it : zipTree(it) } }
with jar
}

dependencies {
apt "org.openjdk.jmh:jmh-generator-annprocess:${jmh.jmhVersion}" // jmh benchmarking

compile "org.openjdk.jmh:jmh-core:${jmh.jmhVersion}"// jmh

compile "org.slf4j:slf4j-api:1.7.+" // logging-api
// compile "org.slf4j:slf4j-ext:1.7.+" // manual performance measures
compile "ch.qos.logback:logback-classic:1.1.+" // logger

compile "com.google.code.findbugs:jsr305:3.0.+" // QA annotations
compile "com.google.guava:guava:19.+" // commons lib

testCompile "junit:junit:4.+" // main tests lib
testCompile "org.mockito:mockito-core:1.10.+" // mocks
testCompile "junit:junit:4.+" // main tests lib
// testCompile "org.mockito:mockito-core:1.10.+" // mocks
}
6 changes: 6 additions & 0 deletions src/main/java/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Manifest-Version: 1.0
Class-Path: slf4j-api-1.7.21.jar logback-core-1.1.7.jar jopt-simple-4.
6.jar logback-classic-1.1.7.jar jmh-core-1.12.jar jsr305-3.0.1.jar gu
ava-19.0.jar commons-math3-3.2.jar
Main-Class: benchmarks.ants.run.AntsRunner

105 changes: 0 additions & 105 deletions src/main/java/benchmarks/ants/AntColonyInteraction.java

This file was deleted.

80 changes: 0 additions & 80 deletions src/main/java/benchmarks/ants/AntsColonies.java

This file was deleted.

Loading

0 comments on commit e83e693

Please sign in to comment.