Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Have the code currently used by Martijn #9

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ buildNumber.properties
/.factorypath
/.classpath
/.project

/target/
/work
8 changes: 8 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<project default="restart">
<target name="restart">
<basename property="project.dir" file="${basedir}"/>
<exec executable="../frank-runner/restart.bat" vmlauncher="false" failonerror="true">
<arg value="-Dproject.dir=${project.dir}"/>
</exec>
</target>
</project>
3 changes: 3 additions & 0 deletions frank-runner.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
maven=true
jdbc.migrator.active=true
ignore.double.jars=true
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<iaf.version>7.5-SNAPSHOT</iaf.version>
<iaf.version>7.5-RC4</iaf.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Als je dan toch update, dan naar de laatste stabiele versie (7.6.4) or naar de laatste release candidate (7.7-RC1)

<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
</properties>
Expand Down
1 change: 1 addition & 0 deletions script/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/~$allIbisVersions.xlsx
pythonHelp/__pycache__/
Binary file modified script/allIbisVersions.xlsx
Binary file not shown.
72 changes: 72 additions & 0 deletions script/graphs.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# This script produces graphs from the output file of
# the ibis4pta Frank config. See the global variables at
# the top of this script for settings.
#
# This is a Python script that works with Python 3. Please
# install the following before running:
#
# pip3 install numpy
# pip3 install matplotlib

from matplotlib import pyplot as plt
import numpy as np
import csv
from pythonHelp import pythonHelp

fileToProcess = "../work/output.csv"
# adapter = "HandlePviewsDispatcher"
# adapter = "HandlePViewsGetData"
# adapter = "HandlePViewsOrchestrate"
# adapter = "HandlePviewsStore"
adapter = "TestXSLTPipe"

plottedFields = ["min", "max", "first", "last", "p50", "stdDev"]

rows = []
with open(fileToProcess, newline="") as csvFile:
reader = csv.DictReader(csvFile, dialect="excel", delimiter=";")
for row in reader:
rows.append(row)

rowsOfAdapter = [selectedRow for selectedRow in rows if selectedRow["adapter"].strip() == adapter.strip()]
rowsOfAdapter = sorted(rowsOfAdapter, key=lambda row: pythonHelp.sortableVersionKey(pythonHelp.SortableVersion(row["ibisversion"])))

def getLabel(previous, current):
newVersion = (previous.getMinor() != current.getMinor()) or (previous.getMajor() != current.getMajor())
newType = (previous.getKind() != current.getKind())
if newVersion and (current.getKind() != pythonHelp.SNAPSHOT):
return "N"
if newVersion and (current.getKind() == pythonHelp.SNAPSHOT):
return str(current.getMajor()) + "." + str(current.getMinor())
if (not newVersion) and newType:
if(current.getKind() == pythonHelp.CANDIDATE):
return "C"
if(current.getKind() == pythonHelp.RELEASE):
return "R"
return None

tickIdx = []
tickLabel = []
if(len(rowsOfAdapter) >= 2):
for i in range(1, len(rowsOfAdapter)):
label = getLabel(pythonHelp.SortableVersion(rowsOfAdapter[i-1]["ibisversion"]), pythonHelp.SortableVersion(rowsOfAdapter[i]["ibisversion"]))
if label is not None:
tickIdx.append(i)
tickLabel.append(label)

x = np.arange(0, len(rowsOfAdapter))
yraw = []
for f in plottedFields:
yraw.append([float(row[f]) for row in rowsOfAdapter])
ymax = max(max(yraw))
for currentY in yraw:
y = np.array(currentY)
plt.plot(x,y)
plt.legend(plottedFields)
plt.ylim(0, ymax)
plt.xlabel("version")
plt.ylabel(adapter)
plt.title('Performance trend')
plt.xticks(tickIdx, tickLabel)
plt.grid("on")
plt.show()
Loading