Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
JasbirShah committed May 27, 2018
2 parents 193f3a9 + 4612aa0 commit 823c020
Show file tree
Hide file tree
Showing 123 changed files with 5,470 additions and 2,289 deletions.
45 changes: 42 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,49 @@
# Iconic Project

## Build Status

## What's New

### Release Notes - 0.1.0 - May 28th, 2018

#### Improvements

* Gene Expression Programming is now in, if a few decades late.
* A new and improved user interface! Still no isomorphism.
* A much better build process, we're done with Batch scripts.

#### Fixes

* The back end has changed so much practically everything's been
fixed in some way. Or at least broken more nicely.

### Compiling

From the root folder:
All commands are assumed to be made from the root project folder

#### Application Programming Interface

```bash
gradlew :api:build
```

#### Command Line Interface

```bash
gradlew :cli:run
gradlew :cli:run -PappArgs="['-i', 'dataChronicKidneyDisease2.txt', '-p', '100', '-g', '500', '-mP', '1.0', '-cP', '1.0']"
```

#### Workbench

To run the client:

```bash
gradlew :client:jfxRun
```

To package a native executable:

```bash
gradle build
java -jar ./api/build/libs/gene-expression-core-0.0.5.jar %1
gradlew :client:jfxNative
```
51 changes: 38 additions & 13 deletions api/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,43 @@
apply plugin: 'application'
plugins {
id 'java-library'
}

mainClassName = 'org.aiconic.Main'
// Jupiter requires Java 8
compileTestJava {
sourceCompatibility = 1.8
targetCompatibility = 1.8
options.compilerArgs << "-Xlint:all" << "-Xlint:-processing"
}

test {
useJUnitPlatform()
}

dependencies {
testCompileOnly group: 'org.apiguardian', name: 'apiguardian-api', version: '1.0.0'
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.1.0'
testCompile group: 'org.mockito', name: 'mockito-core', version: '2.11.0'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.1.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.1.0'
}

version = '0.1.0'

jar {
baseName = 'gene-expression-core'
version = '0.0.5'
baseName = 'iconic-api'

// The Java plugin doesn't specify any of the
// manifest attributes, so we need at least
// these two attributes for the JAR to work
manifest {
attributes(
'Implementation-Title': project.name,
'Implementation-Version': project.version,
'Class-Path': configurations.compile.collect { it.getName() }.join(' '),
)
}

// The Java plugin doesn't specify any of the
// manifest attributes, so we need at least
// these two attributes for the JAR to work
manifest {
attributes(
'Class-Path': configurations.compile.collect { it.getName() }.join(' '),
'Main-Class': 'org.aiconic.Main'
)
}
from {
configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
}
}
Binary file removed api/build/distributions/api.tar
Binary file not shown.
400 changes: 0 additions & 400 deletions api/build/resources/main/dataChronicKidneyDisease.txt

This file was deleted.

400 changes: 0 additions & 400 deletions api/build/resources/test/dataChronicKidneyDisease.txt

This file was deleted.

172 changes: 0 additions & 172 deletions api/build/scripts/api

This file was deleted.

84 changes: 0 additions & 84 deletions api/build/scripts/api.bat

This file was deleted.

4 changes: 0 additions & 4 deletions api/build/tmp/jar/MANIFEST.MF

This file was deleted.

Loading

0 comments on commit 823c020

Please sign in to comment.