commit 560a6301951500c31f6d4551bfab05bb18133ac4
Author: bkopf <vetlehaf@stud.ntnu.no>
Date: Mon, 5 Nov 2018 12:37:22 +0100
Init with old experiment files
Diffstat:
56 files changed, 2010 insertions(+), 0 deletions(-)
diff --git a/c/fifo/reader.c b/c/fifo/reader.c
@@ -0,0 +1,23 @@
+#include <fcntl.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#define MAX_BUF 1024
+
+int main()
+{
+ int fd;
+ char * myfifo = "/tmp/myfifo";
+ char buf[MAX_BUF];
+
+ /* open, read, and display the message from the FIFO */
+ fd = open(myfifo, O_RDONLY);
+ read(fd, buf, MAX_BUF);
+ printf("Received: %s\n", buf);
+ read(fd, buf, MAX_BUF);
+ printf("Received: %s\n", buf);
+ close(fd);
+
+ return 0;
+}
diff --git a/c/fifo/writer.c b/c/fifo/writer.c
@@ -0,0 +1,24 @@
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+int main()
+{
+ int fd;
+ char * myfifo = "/tmp/myfifo";
+
+ /* create the FIFO (named pipe) */
+ mkfifo(myfifo, 0666);
+
+ /* write "Hi" to the FIFO */
+ fd = open(myfifo, O_WRONLY);
+ write(fd, "Hi", sizeof("Hi"));
+ write(fd, "you", sizeof("you"));
+ close(fd);
+
+ /* remove the FIFO */
+ unlink(myfifo);
+
+ return 0;
+}
diff --git a/c/gtk/example-1.c b/c/gtk/example-1.c
@@ -0,0 +1,46 @@
+#include <gtk/gtk.h>
+
+static void
+print_hello (GtkWidget *widget,
+ gpointer data)
+{
+ g_print ("Hello World\n");
+}
+
+static void
+activate (GtkApplication *app,
+ gpointer user_data)
+{
+ GtkWidget *window;
+ GtkWidget *button;
+ GtkWidget *button_box;
+
+ window = gtk_application_window_new (app);
+ gtk_window_set_title (GTK_WINDOW (window), "Window");
+ gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
+
+ button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_container_add (GTK_CONTAINER (window), button_box);
+
+ button = gtk_button_new_with_label ("Hello World");
+ g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL);
+ g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
+ gtk_container_add (GTK_CONTAINER (button_box), button);
+
+ gtk_widget_show_all (window);
+}
+
+int
+main (int argc,
+ char **argv)
+{
+ GtkApplication *app;
+ int status;
+
+ app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+ g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
+ status = g_application_run (G_APPLICATION (app), argc, argv);
+ g_object_unref (app);
+
+ return status;
+}+
\ No newline at end of file
diff --git a/c/gtk/example-x.c b/c/gtk/example-x.c
@@ -0,0 +1,46 @@
+#include <gtk/gtk.h>
+
+static void
+print_hello (GtkWidget *widget,
+ gpointer data)
+{
+ g_print ("Hello World\n");
+}
+
+static void
+activate (GtkApplication *app,
+ gpointer user_data)
+{
+ GtkWidget *dialog;
+ GtkWidget *button;
+ GtkWidget *button_box;
+
+ dialog = gtk_application_dialog_new (app);
+ gtk_dialog_set_title (GTK_DIALOG(dialog), "dialog");
+ gtk_dialog_set_default_size (GTK_dialog (dialog), 200, 200);
+
+ button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_container_add (GTK_CONTAINER (dialog), button_box);
+
+ button = gtk_button_new_with_label ("Hello World");
+ g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL);
+ g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), dialog);
+ gtk_container_add (GTK_CONTAINER (button_box), button);
+
+ gtk_widget_show_all (dialog);
+}
+
+int
+main (int argc,
+ char **argv)
+{
+ GtkApplication *app;
+ int status;
+
+ app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+ g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
+ status = g_application_run (G_APPLICATION (app), argc, argv);
+ g_object_unref (app);
+
+ return status;
+}+
\ No newline at end of file
diff --git a/c/ncurses/comp.sh b/c/ncurses/comp.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+gcc -o ncnu ncnu.c -lncurses
+#./ncnu
diff --git a/c/ncurses/nc1.c b/c/ncurses/nc1.c
@@ -0,0 +1,11 @@
+#include <ncurses.h>
+
+int main(){
+ initscr(); // Creates stdscr (Standard screen). "constructor"
+ raw(); // Does NOT let you exit program with Ctrl-C. use cbreak for exit functionality
+ printw("Hello world!"); // Works pretty much as printf()
+ getch(); // Waits for user to enter character (works as a pause)
+ endwin(); // Frees the memory in the screen and closes ncurses. "destructor"
+
+ return 0;
+}
diff --git a/c/ncurses/nc2.c b/c/ncurses/nc2.c
@@ -0,0 +1,18 @@
+#include <ncurses.h>
+
+int main(){
+ initscr();
+ raw(); // Does NOT let you exit program with Ctrl-C. use cbreak for exit functionality
+ int testvar = 4;
+ printw("This is bog standard string output %d", testvar);
+ addch('a'); // Writes chars to the screen.
+ move(12, 13); // Moves the cursor on the screen
+ // ^y ^x
+
+ mvprintw(15, 20, "Movement"); // Move cursor, then print at cursor.
+ mvaddch(12,50, '@'); // Move cursor, then add character.
+ getch();
+ endwin(); // Frees the memory in the screen and closes ncurses. "destructor"
+
+ return 0;
+}
diff --git a/c/ncurses/nc3.c b/c/ncurses/nc3.c
@@ -0,0 +1,16 @@
+#include <ncurses.h>
+// tutorial 3 - using attributes
+
+int main(){
+ initscr();
+ raw();
+
+ // Attribute:
+ attron(A_STANDOUT | A_UNDERLINE);
+ mvprintw(0, 40, "READ THIS NOW");
+ attroff(A_STANDOUT | A_UNDERLINE);
+
+ endwin();
+
+ return 0;
+}
diff --git a/c/ncurses/nc4.c b/c/ncurses/nc4.c
@@ -0,0 +1,17 @@
+#include <ncurses.h>
+
+int main(){
+ initscr();
+ raw(); // Does NOT let you exit program with Ctrl-C. use cbreak for exit functionality
+ start_color();
+ init_pair(1, COLOR_RED, COLOR_BLUE); // Corresponds to a pair of colors (foreground, background).
+ attron(COLOR_PAIR(1)); // Set the newly created color pair as attribute
+ printw("It huuuurts!"); //
+ attroff(COLOR_PAIR(1));
+
+
+ getch();
+ endwin(); // Frees the memory in the screen and closes ncurses. "destructor"
+
+ return 0;
+}
diff --git a/c/ncurses/ncmenu.c b/c/ncurses/ncmenu.c
@@ -0,0 +1,44 @@
+#include <ncurses.h>
+
+int main(){
+ initscr();
+ noecho();
+ cbreak();
+
+ int yMax, xMax;
+ getmaxyx(stdscr, yMax, xMax);
+
+ WINDOW * menuwin = newwin(6, xMax - 12, yMax-8, 5);
+ box(menuwin,0, 0);
+ refresh();
+ wrefresh(menuwin);
+
+ char num;
+ int posX=xMax - 30, posY=yMax - 5;
+ while(num != '0'){
+ num = getch();
+ mvaddch(posY, posX, ' ');
+ switch(num){
+ case 'n':
+ posY++;
+ break;
+ case 'e':
+ posY--;
+ break;
+ case 'h':
+ posX--;
+ break;
+ case 'i':
+ posX++;
+ break;
+ default:
+ break;
+ }
+ mvaddch(posY, posX, 'o');
+ refresh();
+ wrefresh(menuwin);
+ }
+ endwin();
+
+ return 0;
+}
diff --git a/c/ncurses/ncnu.c b/c/ncurses/ncnu.c
@@ -0,0 +1,173 @@
+#include <ncurses.h>
+
+
+// modes
+#define INSERT 0
+#define EDIT 1
+// line number offset
+#define LN_OFFSET 5
+
+float step = 0.125;
+int curX = 0;
+int curY = 0;
+int yMax, xMax;
+int mode = INSERT;
+
+/* owwd = owerwrite default */
+bool owwd_note = true;
+int default_note = 69; //TODO: add option for displaying frequency, supercollider note etc.
+bool owwd_dur = true;
+int default_dur = 0.5;
+
+
+// This will later be used to connect the instrument letters to actual names.
+char* instlist[] = {"piano", "violin", "testins"};
+char* get_instrument(char** instlist, char insnum) { return instlist[insnum - 'A']; }
+
+//TODO: typedef for note events (containing start_time, duration, note etc)
+//TODO: Set minimum and maximum values for some of the numbers.
+//TODO: Instead of hard coding the keybindings, make a header file like dwm
+// for starters, and perhaps a runtime config file later
+//TODO: Implement a tone buffer that contains all of the existing notes plus the
+// one about to be placed, so that this can be used to decide the properties
+// of the new note (the buffer will be played when 'p' is pushed).
+
+int insert_events(){
+ char inst = 'A';
+ int note = default_note;
+ float start_time = 0.5;
+ float dur = 0.5;
+ char num;
+ mvprintw(curY, curX + LN_OFFSET, "%c(%d, %1.3f, %1.3f)", inst, note, start_time, dur);
+ refresh();
+ while (1){
+ num = getch();
+ switch(num){
+ /* Changing instrument */
+ case 'z':
+ inst++;
+ break;
+ case 'Z':
+ inst--;
+ break;
+ /* Changing note, duration, position */
+ case 'n':
+ note--;
+ break;
+ case 'N':
+ note -= 12;
+ break;
+ case 'e':
+ note++;
+ break;
+ case 'E':
+ note += 12;
+ break;
+ /* Change duration */
+ case 'h':
+ dur -= step;
+ break;
+ case 'i':
+ dur += step;
+ break;
+ /* Change position */
+ case 's':
+ start_time -= step;
+ break;
+ case 't':
+ start_time += step;
+ break;
+ /* Finishing insert */
+ case ',':
+ printw(", ");
+ getyx(stdscr, curY, curX);
+ // TODO: a function that appends the new note event to a .txt file, so it matches what's
+ // shown on the display.
+ if(owwd_note) default_note = note;
+ return INSERT;
+ case 10: // this is enter
+ curX = 0;
+ curY++;
+ if(owwd_note) default_note = note;
+ return INSERT;
+ case 27: // esc
+ return EDIT;
+ default:
+ break;
+ }
+ mvprintw(curY, curX+LN_OFFSET, "%c(%d, %1.3f, %1.3f)", inst, note, start_time, dur);
+ mvprintw(yMax - 5, 1, "- New entry-\n note: %d\n start time: %1.3f\n duration: %1.3f", note, start_time, dur);
+ /* mvprintw(yMax - 5, 1, "- New entry-\n instrument: %s\n note: %d\n start time: %1.3f\n duration: %1.3f",
+ get_instrument(instlist, inst), note, start_time, dur);
+ // This includes the name of the instrument */
+ refresh();
+ }
+}
+/* Tonebook is the name of the notepad like text display */
+void draw_tonepad(int yLen, int yFirstNum){
+ // quick and dirty
+ for(int i = 0; i < yLen; i++){
+ if(i < 10)
+ mvprintw(i, 0, " %d", yFirstNum + i);
+ else if(i < 100)
+ mvprintw(i, 0, " %d", yFirstNum + i);
+ else if(i < 1000)
+ mvprintw(i, 0, " %d", yFirstNum + i);
+ else
+ mvprintw(i, 0, "%d", yFirstNum + i);
+ }
+}
+
+int edit_events(){
+ char num;
+ while (1){
+ num = getch();
+ switch(num){
+ /* Changing instrument */
+ case 'z':
+ inst++;
+ break;
+ case 'Z':
+ inst--;
+ break;
+ /* Changing note, duration, position */
+ case 'n':
+ note--;
+ break;
+ case 'N':
+ note -= 12;
+ break;
+ case 'e':
+ note++;
+ break;
+ case 'E':
+ note += 12;
+ break;
+ /* Change duration */
+ case 'h':
+ dur -= step;
+ break;
+}
+
+int main(){
+ initscr();
+ noecho();
+ cbreak();
+
+ // max positions
+ getmaxyx(stdscr, yMax, xMax);
+ draw_tonepad(yMax - 8, 0);
+
+ // current position
+ bool running = 1;
+ while(running){
+ while(mode == EDIT)
+ mode = edit_events();
+ while(mode == INSERT)
+ mode = insert_events();
+ running = 0;
+ }
+ endwin();
+
+ return 0;
+}
diff --git a/c/ncurses/ncwt.c b/c/ncurses/ncwt.c
@@ -0,0 +1,30 @@
+#include <ncurses.h>
+#include <unistd.h>
+// ncurses and getcwd. Baaaasics of a filemanager
+
+int main(){
+ initscr();
+ raw();
+
+
+ char cwd[1024];
+ if(getcwd(cwd, sizeof(cwd)) != NULL)
+ printw("%s\n", cwd);
+ else{
+ printw("Working dir not found");
+ return 0;
+ }
+
+ char nuch;
+ int pos = 0;
+ while(nuch != '0'){
+ nuch = getch();
+ move(0,pos);
+ addch(nuch);
+ pos++;
+ }
+
+ endwin();
+
+ return 0;
+}
diff --git a/c/ncurses/tldp_test.c b/c/ncurses/tldp_test.c
@@ -0,0 +1,20 @@
+#include <ncurses.h> /* ncurses.h includes stdio.h */
+#include <string.h>
+
+int main()
+{
+ char mesg[]="Enter a string: "; /* message to be appeared on the screen */
+ char str[80];
+ int row,col; /* to store the number of rows and *
+ * the number of colums of the screen */
+ initscr(); /* start the curses mode */
+ getmaxyx(stdscr,row,col); /* get the number of rows and columns */
+ mvprintw(row/2,(col-strlen(mesg))/2,"%s",mesg);
+ /* print the message at the center of the screen */
+ getstr(str);
+ mvprintw(LINES - 2, 0, "You Entered: %s", str);
+ getch();
+ endwin();
+
+ return 0;
+}
diff --git a/cpp/getperiod.cpp b/cpp/getperiod.cpp
@@ -0,0 +1,29 @@
+#include <iostream>
+#include <math.h>
+#define PI2 6.28318530718
+
+using namespace std;
+
+double getPeriod(double* signal, int N)
+{
+ /* 1. Calculate the autocorrelation function (acf)
+ * 2. Find the next local maximum of the acf.
+ * This can be found by finding the next max value that
+ * is bigger than both its neighbor values, or at least
+ * bigger than the previous value.
+ */
+}
+
+int main()
+{
+ int N = 44100;
+ double f = 2.565;
+ double* audio = new double[N];
+ for(int n = 0; n < N; n++)
+ {
+ audio[n] = sin(PI2*f*n/N);
+ }
+
+ cout << "T = " << getPeriod(audio, N) << endl;
+ delete[] audio;
+}
diff --git a/cpp/printplot b/cpp/printplot
Binary files differ.
diff --git a/cpp/printplot.cpp b/cpp/printplot.cpp
@@ -0,0 +1,72 @@
+#include <iostream>
+#include <string>
+#include <math.h>
+#define PI2 6.28318530718
+
+using namespace std;
+void pp(double* signal, int N, int M)
+{
+ // N is signal length. M is sample resolution.
+ double threshold[M-1];
+ double sampled[N];
+ // If M is odd:
+ if(M % 2){
+
+ }
+ // If M is even:
+ else {
+ for(int l = 0; l < M-1; l++)
+ threshold[l] = double(2*l - (M - 2)) / M;
+ }
+
+ // height is the resolution (in characters of each sample)
+ // width is the number of samples
+ for(int n = 0; n < N; n++) {
+ for(int l = 0; l < M-1; l++){
+ if(signal[n] < threshold[l] ){
+ sampled[n] = l;
+ break;
+ }
+ if(l == M-2){
+ sampled[n] = M;
+ break;
+ }
+ }
+ }
+ // Plot:
+ for(int m = M; m > 0; m--) {
+ // Evaluated each character
+ for(int n = 0; n < N; n++)
+ {
+ if(sampled[n] == m && n > 1){
+ if(sampled[n] < sampled[n-1] && sampled[n-1] < sampled[n-2])
+ cout << "\\";
+ else if(sampled[n] > sampled[n-1] && sampled[n-1] > sampled[n-2])
+ cout << "/";
+ else
+ cout << "-";
+ }
+ else
+ cout << " ";
+ }
+ cout << endl;
+ }
+}
+
+int main()
+{
+ double freq;
+ int N = 100;
+ double signal[N];
+
+ // Create a sin to use as example
+ cout << "Frequency: ";
+ cin >> freq;
+ for(int n = 0; n < N; n++) {
+ signal[n] = sin(PI2*freq*n/N);
+ }
+ pp(signal, N, 30);
+
+ return 0;
+}
+
diff --git a/cpp/printplot2 b/cpp/printplot2
Binary files differ.
diff --git a/cpp/printplot2.cpp b/cpp/printplot2.cpp
@@ -0,0 +1,66 @@
+#include <iostream>
+#include <string>
+#include <math.h>
+#define PI2 6.28318530718
+
+// THIS IS CURRENTLY NOT WORKING
+using namespace std;
+void pp(double* signal, int N, int res)
+{
+ // N is signal length. res is plot resolution.
+ int M = 65536; // Bit depth of 16 bits.
+ double threshold[M-1];
+ double sampled[N];
+ for(int l = 0; l < M-1; l++)
+ threshold[l] = double(2*l - (M - 2)) / M;
+
+ // "Sample" the input signal to 16 bit int
+ for(int n = 0; n < N; n++) {
+ for(int l = 0; l < M-1; l++){
+ if(signal[n] < threshold[l] ){
+ sampled[n] = l;
+ break;
+ }
+ if(l == M-2){
+ sampled[n] = M;
+ break;
+ }
+ }
+ }
+ // Plot:
+ for(int line = res; line > 0; line--) {
+ // Evaluated each character
+ for(int n = 0; n < N; n++)
+ {
+ if(sampled[n]/M == line && n > 0){
+ if(sampled[n] < sampled[n-1])
+ cout << "\\";
+ else if(sampled[n] > sampled[n-1])
+ cout << "/";
+ else
+ cout << "-";
+ }
+ else
+ cout << " ";
+ }
+ cout << endl;
+ }
+}
+
+int main()
+{
+ double freq;
+ int N = 100;
+ double signal[N];
+
+ // Create a sin to use as example
+ cout << "Frequency: ";
+ cin >> freq;
+ for(int n = 0; n < N; n++) {
+ signal[n] = sin(PI2*freq*n/N);
+ }
+ pp(signal, N, 30);
+
+ return 0;
+}
+
diff --git a/cpp/testsp.sh b/cpp/testsp.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+# Temporary script to build (replace with makefile)
+
+clear
+g++ -g printplot.cpp -o printplot -lm -pthread
diff --git a/java/MSPExperiments/.idea/misc.xml b/java/MSPExperiments/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/out" />
+ </component>
+</project>+
\ No newline at end of file
diff --git a/java/MSPExperiments/.idea/modules.xml b/java/MSPExperiments/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/MSPExperiments.iml" filepath="$PROJECT_DIR$/MSPExperiments.iml" />
+ </modules>
+ </component>
+</project>+
\ No newline at end of file
diff --git a/java/MSPExperiments/.idea/workspace.xml b/java/MSPExperiments/.idea/workspace.xml
@@ -0,0 +1,449 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ChangeListManager">
+ <list default="true" id="8e086497-84c1-4e93-8d77-49100887fe59" name="Default" comment="" />
+ <ignored path="$PROJECT_DIR$/out/" />
+ <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+ <option name="TRACKING_ENABLED" value="true" />
+ <option name="SHOW_DIALOG" value="false" />
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+ <option name="LAST_RESOLUTION" value="IGNORE" />
+ </component>
+ <component name="FileEditorManager">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+ </component>
+ <component name="FileTemplateManagerImpl">
+ <option name="RECENT_TEMPLATES">
+ <list>
+ <option value="Class" />
+ </list>
+ </option>
+ </component>
+ <component name="GradleLocalSettings">
+ <option name="externalProjectsViewState">
+ <projects_view />
+ </option>
+ </component>
+ <component name="IdeDocumentHistory">
+ <option name="CHANGED_PATHS">
+ <list>
+ <option value="$PROJECT_DIR$/src/DCT.java" />
+ <option value="$PROJECT_DIR$/src/MatrixFile.java" />
+ <option value="$PROJECT_DIR$/src/Main.java" />
+ <option value="$PROJECT_DIR$/src/Matrix.java" />
+ </list>
+ </option>
+ </component>
+ <component name="ProjectFrameBounds">
+ <option name="y" value="19" />
+ <option name="width" value="1920" />
+ <option name="height" value="1061" />
+ </component>
+ <component name="ProjectView">
+ <navigator currentView="ProjectPane" proportions="" version="1">
+ <flattenPackages />
+ <showMembers />
+ <showModules />
+ <showLibraryContents />
+ <hideEmptyPackages />
+ <abbreviatePackageNames />
+ <autoscrollToSource />
+ <autoscrollFromSource />
+ <sortByType />
+ <manualOrder />
+ <foldersAlwaysOnTop value="true" />
+ </navigator>
+ <panes>
+ <pane id="Scratches" />
+ <pane id="AndroidView" />
+ <pane id="Scope" />
+ <pane id="ProjectPane">
+ <subPane>
+ <expand>
+ <path>
+ <item name="MSPExperiments" type="b2602c69:ProjectViewProjectNode" />
+ <item name="MSPExperiments" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="MSPExperiments" type="b2602c69:ProjectViewProjectNode" />
+ <item name="MSPExperiments" type="462c0819:PsiDirectoryNode" />
+ <item name="out" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="MSPExperiments" type="b2602c69:ProjectViewProjectNode" />
+ <item name="MSPExperiments" type="462c0819:PsiDirectoryNode" />
+ <item name="out" type="462c0819:PsiDirectoryNode" />
+ <item name="production" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="MSPExperiments" type="b2602c69:ProjectViewProjectNode" />
+ <item name="MSPExperiments" type="462c0819:PsiDirectoryNode" />
+ <item name="out" type="462c0819:PsiDirectoryNode" />
+ <item name="production" type="462c0819:PsiDirectoryNode" />
+ <item name="MSPExperiments" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="MSPExperiments" type="b2602c69:ProjectViewProjectNode" />
+ <item name="MSPExperiments" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="MSPExperiments" type="b2602c69:ProjectViewProjectNode" />
+ <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+ </path>
+ </expand>
+ <select />
+ </subPane>
+ </pane>
+ <pane id="PackagesPane" />
+ </panes>
+ </component>
+ <component name="PropertiesComponent">
+ <property name="settings.editor.selected.configurable" value="android.sdk-updates" />
+ <property name="android.sdk.path" value="$USER_HOME$/.android-sdk" />
+ </component>
+ <component name="RunDashboard">
+ <option name="ruleStates">
+ <list>
+ <RuleState>
+ <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+ </RuleState>
+ <RuleState>
+ <option name="name" value="StatusDashboardGroupingRule" />
+ </RuleState>
+ </list>
+ </option>
+ </component>
+ <component name="RunManager">
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <module />
+ </configuration>
+ <configuration name="Unnamed" type="Application" factoryName="Application">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <option name="MAIN_CLASS_NAME" value="Main" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="MSPExperiments" />
+ <envs />
+ </configuration>
+ <configuration default="true" type="Application" factoryName="Application">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="" />
+ <envs />
+ </configuration>
+ <configuration default="true" type="JUnit" factoryName="JUnit">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <envs />
+ <patterns />
+ </configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
+ <configuration default="true" type="TestNG" factoryName="TestNG">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="ANNOTATION_TYPE" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <option name="USE_DEFAULT_REPORTERS" value="false" />
+ <option name="PROPERTIES_FILE" />
+ <envs />
+ <properties />
+ <listeners />
+ </configuration>
+ <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+ <module name="" />
+ <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+ <option name="PROGRAM_PARAMETERS" />
+ <predefined_log_file id="idea.log" enabled="true" />
+ </configuration>
+ </component>
+ <component name="ShelveChangesManager" show_recycled="false">
+ <option name="remove_strategy" value="false" />
+ </component>
+ <component name="SvnConfiguration">
+ <configuration />
+ </component>
+ <component name="TaskManager">
+ <task active="true" id="Default" summary="Default task">
+ <changelist id="8e086497-84c1-4e93-8d77-49100887fe59" name="Default" comment="" />
+ <created>1527183090603</created>
+ <option name="number" value="Default" />
+ <option name="presentableId" value="Default" />
+ <updated>1527183090603</updated>
+ </task>
+ <servers />
+ </component>
+ <component name="ToolWindowManager">
+ <frame x="0" y="19" width="1920" height="1061" extended-state="0" />
+ <layout>
+ <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="TMC Test Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32994923" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="TMC Project List" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+ <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+ <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ </layout>
+ </component>
+ <component name="VcsContentAnnotationSettings">
+ <option name="myLimit" value="2678400000" />
+ </component>
+ <component name="XDebuggerManager">
+ <breakpoint-manager />
+ <watches-manager />
+ </component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/src/Matrix.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1206">
+ <caret line="71" column="4" lean-forward="false" selection-start-line="71" selection-start-column="4" selection-end-line="71" selection-end-column="4" />
+ <folding>
+ <element signature="e#338#339#0" expanded="true" />
+ <element signature="e#370#371#0" expanded="true" />
+ <element signature="e#624#625#0" expanded="true" />
+ <element signature="e#669#670#0" expanded="true" />
+ <element signature="e#2204#2205#0" expanded="true" />
+ <element signature="e#2239#2240#0" expanded="true" />
+ <element signature="e#2266#2267#0" expanded="true" />
+ <element signature="e#2298#2299#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/DCT.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="450">
+ <caret line="27" column="0" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+ <folding>
+ <element signature="e#694#695#0" expanded="true" />
+ <element signature="e#753#754#0" expanded="true" />
+ <element signature="e#798#799#0" expanded="true" />
+ <element signature="e#838#839#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Main.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="18" lean-forward="false" selection-start-line="0" selection-start-column="18" selection-end-line="0" selection-end-column="18" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/MatrixFile.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="234">
+ <caret line="17" column="8" lean-forward="false" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#1551#1552#0" expanded="true" />
+ <element signature="e#1589#1590#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Matrix.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1098">
+ <caret line="65" column="25" lean-forward="false" selection-start-line="65" selection-start-column="25" selection-end-line="65" selection-end-column="25" />
+ <folding>
+ <element signature="e#338#339#0" expanded="true" />
+ <element signature="e#370#371#0" expanded="true" />
+ <element signature="e#624#625#0" expanded="true" />
+ <element signature="e#669#670#0" expanded="true" />
+ <element signature="e#2204#2205#0" expanded="true" />
+ <element signature="e#2239#2240#0" expanded="true" />
+ <element signature="e#2266#2267#0" expanded="true" />
+ <element signature="e#2298#2299#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/DCT.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="450">
+ <caret line="25" column="8" lean-forward="false" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="8" />
+ <folding>
+ <element signature="e#694#695#0" expanded="true" />
+ <element signature="e#753#754#0" expanded="true" />
+ <element signature="e#798#799#0" expanded="true" />
+ <element signature="e#838#839#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Matrix.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="432">
+ <caret line="24" column="19" lean-forward="false" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
+ <folding>
+ <element signature="e#338#339#0" expanded="true" />
+ <element signature="e#370#371#0" expanded="true" />
+ <element signature="e#624#625#0" expanded="true" />
+ <element signature="e#669#670#0" expanded="true" />
+ <element signature="e#2204#2205#0" expanded="true" />
+ <element signature="e#2239#2240#0" expanded="true" />
+ <element signature="e#2266#2267#0" expanded="true" />
+ <element signature="e#2298#2299#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/DCT.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="270">
+ <caret line="15" column="67" lean-forward="false" selection-start-line="15" selection-start-column="67" selection-end-line="15" selection-end-column="67" />
+ <folding>
+ <element signature="e#694#695#0" expanded="true" />
+ <element signature="e#753#754#0" expanded="true" />
+ <element signature="e#798#799#0" expanded="true" />
+ <element signature="e#838#839#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Main.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="54">
+ <caret line="3" column="37" lean-forward="false" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="37" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/out/production/MSPExperiments/matrix.mat">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/DCT.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="576">
+ <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
+ <folding>
+ <element signature="e#694#695#0" expanded="true" />
+ <element signature="e#753#754#0" expanded="true" />
+ <element signature="e#798#799#0" expanded="true" />
+ <element signature="e#838#839#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/MatrixFile.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="252">
+ <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#1551#1552#0" expanded="true" />
+ <element signature="e#1589#1590#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Main.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="162">
+ <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Matrix.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="414">
+ <caret line="53" column="48" lean-forward="false" selection-start-line="53" selection-start-column="48" selection-end-line="53" selection-end-column="48" />
+ <folding>
+ <element signature="e#338#339#0" expanded="true" />
+ <element signature="e#370#371#0" expanded="true" />
+ <element signature="e#624#625#0" expanded="true" />
+ <element signature="e#669#670#0" expanded="true" />
+ <element signature="e#2204#2205#0" expanded="true" />
+ <element signature="e#2239#2240#0" expanded="true" />
+ <element signature="e#2266#2267#0" expanded="true" />
+ <element signature="e#2298#2299#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </component>
+</project>+
\ No newline at end of file
diff --git a/java/MSPExperiments/MSPExperiments.iml b/java/MSPExperiments/MSPExperiments.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>+
\ No newline at end of file
diff --git a/java/MSPExperiments/out/production/MSPExperiments/matrix.mat b/java/MSPExperiments/out/production/MSPExperiments/matrix.mat
@@ -0,0 +1,9 @@
+8x8
+-76 -73 -67 -62 -58 -67 -64 -55
+-65 -69 -73 -38 -19 -43 -59 -56
+-66 -69 -60 -15 16 -24 -62 -55
+-65 -70 -57 -6 -26 -22 -58 -59
+-61 -67 -60 -24 -2 -40 -60 -58
+-49 -63 -68 -58 -51 -60 -70 -53
+-43 -57 -64 -69 -73 -67 -63 -45
+-41 -49 -59 -60 -63 -52 -50 -34
diff --git a/java/MSPExperiments/src/DCT.java b/java/MSPExperiments/src/DCT.java
@@ -0,0 +1,33 @@
+public class DCT {
+ private int M;
+ Matrix A; // transformation matrix
+ Matrix AT; // transported
+
+ public DCT(int blockSize){
+ this.M = blockSize;
+ this.A = new Matrix(blockSize);
+ this.generateTransformMatrix();
+ this.AT = this.A.getTransposed();
+ }
+
+ public void generateTransformMatrix(){
+ for (int c = 0; c < M; c++){
+ A.set(0, c, Math.sqrt(1.0/M) );
+ }
+ double a = Math.sqrt(2.0/M);
+ for (int r = 1; r < M; r++){
+ for (int c = 0; c < M; c++) {
+ A.set(r, c, a*Math.cos( (2*c + 1) * r*Math.PI / (2 * M)) );
+ }
+ }
+ }
+
+ public Matrix transform(Matrix x){
+ return this.A.multiply(x).multiply(this.AT);
+ }
+
+ @Override
+ public String toString(){
+ return this.A.toString();
+ }
+}
diff --git a/java/MSPExperiments/src/Main.java b/java/MSPExperiments/src/Main.java
@@ -0,0 +1,11 @@
+public class Main {
+
+ public static void main(String[] args){
+ DCT transform = new DCT(8);
+ MatrixFile matrixFile = new MatrixFile("matrix.mat");
+ Matrix matrix = matrixFile.getMatrix();
+ System.out.println(transform);
+ System.out.println(matrix);
+ System.out.println(transform.transform(matrix));
+ }
+}
diff --git a/java/MSPExperiments/src/Matrix.java b/java/MSPExperiments/src/Matrix.java
@@ -0,0 +1,89 @@
+import java.util.Scanner;
+
+public class Matrix {
+ private int columns;
+ private int rows;
+ private double[][] matrix;
+
+ public Matrix(int rows, int columns){
+ this.rows = rows;
+ this.columns = columns;
+ this.matrix = new double[rows][columns];
+ this.initToZero();
+ }
+
+ public Matrix(int size){
+ this(size, size);
+ }
+
+ private void initToZero(){
+ for (int r = 0; r < this.rows; r++){
+ for (int c = 0; c < this.columns; c++){
+ this.matrix[r][c] = 0.0;
+ }
+ }
+ }
+
+ public void set(int row, int col, double value){
+ this.matrix[row][col] = value;
+ }
+
+ public Matrix multiply(Matrix B){
+ Matrix A = this; // for readability
+ if (A.columns != B.rows)
+ return null;
+
+ Matrix C = new Matrix(A.rows, B.columns);
+ for (int r = 0; r < rows; r++){
+ for (int c = 0; c < columns; c++){
+ C.matrix[r][c] = 0.0;
+ for (int i = 0; i < this.columns; i++){
+ C.matrix[r][c] += A.matrix[r][i] * B.matrix[i][c];
+ }
+ }
+
+ }
+ return C;
+ }
+
+ @Override
+ public String toString(){
+ String toReturn = "";
+ for (int r = 0; r < this.rows; r++) {
+ for (int c = 0; c < this.columns; c++) {
+ toReturn += String.format("%1.4f \t", this.matrix[r][c]);
+ }
+ toReturn += "\n";
+ }
+ return toReturn;
+ }
+
+ public Matrix getTransposed(){
+ Matrix transposed = new Matrix(columns, rows);
+ for (int r = 0; r < rows; r++){
+ for (int c = 0; c < columns; c++){
+ transposed.matrix[c][r] = this.matrix[r][c];
+ }
+ }
+ return transposed;
+ }
+
+ public void insertMatrix(){
+ Scanner reader = new Scanner(System.in);
+ System.out.println("Insert the matrix elements col by col, row by row:");
+ for (int r = 0; r < this.rows; r++){
+ for (int c = 0; c < this.columns; c++){
+ this.matrix[r][c] = Double.parseDouble(reader.next());
+ }
+ }
+ }
+
+ public int getColumns(){
+ return this.columns;
+ }
+
+ public int getRows(){
+ return this.rows;
+ }
+
+}
diff --git a/java/MSPExperiments/src/MatrixFile.java b/java/MSPExperiments/src/MatrixFile.java
@@ -0,0 +1,54 @@
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Scanner;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class MatrixFile {
+ File mFile;
+ Scanner fileReader;
+ Matrix matrixRead;
+ Pattern pattern;
+ Matcher matcher;
+
+ public MatrixFile(String filename){
+ this.mFile = new File(filename);
+ pattern = Pattern.compile("(\\d)x(\\d)");
+ try {
+ int rows = 0; int cols = 0;
+ this.fileReader = new Scanner(this.mFile);
+ String line = fileReader.nextLine();
+ matcher = pattern.matcher(line);
+ if (matcher.matches()){
+ rows = Integer.parseInt(matcher.group(1));
+ cols = Integer.parseInt(matcher.group(2));
+ } else {
+ throw new Exception("Matrix in wrong format");
+ }
+ this.matrixRead = new Matrix(rows, cols);
+ String newValue;
+ for (int r = 0; r < rows; r++) {
+ for (int c = 0; c < rows; c++) {
+ if ((newValue = fileReader.next()) != null){
+ this.matrixRead.set(r, c, Double.parseDouble(newValue));
+ } else {
+ throw new Exception("Matrix in wrong format");
+ }
+ }
+ }
+
+
+ }
+ catch (FileNotFoundException e){
+ e.printStackTrace();
+ }
+ catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ public Matrix getMatrix(){
+ return this.matrixRead;
+ }
+
+}
diff --git a/java/MSPExperiments/src/matrix.mat b/java/MSPExperiments/src/matrix.mat
@@ -0,0 +1,9 @@
+8x8
+-76 -73 -67 -62 -58 -67 -64 -55
+-65 -69 -73 -38 -19 -43 -59 -56
+-66 -69 -60 -15 16 -24 -62 -55
+-65 -70 -57 -6 -26 -22 -58 -59
+-61 -67 -60 -24 -2 -40 -60 -58
+-49 -63 -68 -58 -51 -60 -70 -53
+-43 -57 -64 -69 -73 -67 -63 -45
+-41 -49 -59 -60 -63 -52 -50 -34
diff --git a/python/Embedding Python In Your C++ Application - CodeProject.url b/python/Embedding Python In Your C++ Application - CodeProject.url
@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=http://www.codeproject.com/Articles/14192/Embedding-Python-In-Your-C-Application
diff --git a/python/Python GUI Programming (Tkinter).url b/python/Python GUI Programming (Tkinter).url
@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=https://www.tutorialspoint.com/python/python_gui_programming.htm
diff --git a/python/SMTPClient_inspiration.py b/python/SMTPClient_inspiration.py
@@ -0,0 +1,68 @@
+# This skeleton is valid for both Python 2.7 and Python 3.
+# You should be aware of your additional code for compatibility of the Python version of your choice.
+
+from socket import *
+
+# Message to send
+msg = "\r\n I love computer networks!"
+endmsg = "\r\n.\r\n"
+
+# Our mail server is smtp.stud.ntnu.no
+mailserver = 'smtp.stud.ntnu.no'
+
+# Create socket called clientSocket and establish a TCP connection
+# (use the appropriate port) with mailserver
+#Fill in start
+clientSocket = socket(AF_INET, SOCK_STREAM)
+clientSocket.connect((mailserver, 25)) # 25 is the standard SMTP port
+#Fill in end
+
+recv = clientSocket.recv(1024)
+print(recv)
+if recv[:3] != '220':
+ print('220 reply not received from server.'.encode('utf-8'))
+
+# Send HELO command and print server response.
+heloCommand = 'HELO Alice\r\n'
+clientSocket.send(heloCommand.encode('utf-8'))
+recv1 = clientSocket.recv(1024)
+print(recv1.decode('utf-8'))
+
+if recv1[:3] != '250':
+ print('250 reply not received from server.')
+
+# Send MAIL FROM command and print server response.
+# Fill in start
+clientSocket.send('MAIL FROM: <vetlehaf@stud.ntnu.no>\r\n'.encode('utf-8'))
+recv2 = clientSocket.recv(1024)
+print(recv2.decode('utf-8'))
+# Fill in end
+
+# Send RCPT TO command and print server response.
+# Fill in start
+clientSocket.send('RCPT TO: <vetlehaf@stud.ntnu.no>\r\n'.encode('utf-8'))
+recv3 = clientSocket.recv(1024)
+print(recv3.decode('utf-8'))
+# Fill in end
+
+# Send DATA command and print server response.
+# Fill in start
+clientSocket.send('DATA\r\n'.encode('utf-8'))
+recv4 = clientSocket.recv(1024)
+print(recv4.decode('utf-8'))
+# Fill in end
+
+# Send message data.
+# Fill in start
+clientSocket.send(msg.encode('utf-8'))
+# Fill in end
+
+# Message ends with a single period.
+# Fill in start
+clientSocket.send(endmsg.encode('utf-8'))
+# Fill in end
+
+# Send QUIT command and get server response.
+# Fill in start
+clientSocket.send('QUIT\r\n'.encode('utf-8'))
+# Fill in end
diff --git a/python/The Tkinter Canvas Widget.url b/python/The Tkinter Canvas Widget.url
@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=http://effbot.org/tkinterbook/canvas.htm
diff --git a/python/The Tkinter Grid Geometry Manager.url b/python/The Tkinter Grid Geometry Manager.url
@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=http://effbot.org/tkinterbook/grid.htm
diff --git a/python/ThreadingTest.py b/python/ThreadingTest.py
@@ -0,0 +1,28 @@
+from threading import Thread
+
+class iterator(Thread):
+ def __init__(self):
+ Thread.__init__(self)
+ self.daemon = True # When only daemon threads are running, the program exits
+ def run(self): # This function is called when the <object>.start() is executed.
+ x = 0
+ self.y = 0
+ while True:
+ x += 1
+ if x == 5000000:
+ x = 0
+ self.y += 1
+
+if __name__ == '__main__':
+ saveit = iterator()
+ saveit.start()
+ print( """Commands:
+ \n\tit\t- Print number of iterations from thread\
+ \n\tquit\t- Quit program
+ """)
+ while True:
+ invar = input('> ')
+ if invar == 'quit':
+ break
+ elif invar == 'it':
+ print('Iterations: ' + str(saveit.y))
diff --git a/python/ex1.py b/python/ex1.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+varia = 342.355
+inc = 12.00
+
+print "%f inches is %f centimeters" % (inc, inc * 2.51)+
\ No newline at end of file
diff --git a/python/keylog.txt b/python/keylog.txt
@@ -0,0 +1,62 @@
+Key.alt: 22
+'r': 18
+'e': 150
+'n': 212
+'p': 17
+Key.tab: 14
+'g': 23
+'a': 12
+Key.shift: 19
+':': 7
+'q': 12
+Key.enter: 20
+'x': 13
+'i': 35
+'t': 33
+'j': 3
+'f': 23
+'z': 6
+Key.space: 24
+'s': 17
+'l': 6
+'d': 38
+'h': 5
+Key.backspace: 13
+',': 4
+'w': 24
+Key.delete: 4
+Key.ctrl: 9
+Key.right: 3
+Key.end: 1
+Key.up: 16
+Key.down: 31
+Key.home: 1
+'m': 6
+'c': 11
+'-': 2
+'?': 1
+'u': 5
+'o': 12
+Key.ctrl_r: 19
+Key.shift_r: 8
+Key.esc: 2
+'!': 1
+Key.left: 1
+'N': 3
+'y': 2
+'W': 1
+'V': 1
+'/': 5
+'b': 2
+'\\': 1
+'{': 1
+'L': 1
+'}': 1
+Key.f5: 4
+"'": 1
+<65056>: 1
+'3': 1
+'G': 1
+'C': 1
+'H': 3
+Key.print_screen: 1
diff --git a/python/python_challenge4.py b/python/python_challenge4.py
@@ -0,0 +1,11 @@
+import urllib.request
+import re
+
+page = urllib.request.urlopen('http://www.pythonchallenge.com/pc/def/linkedlist.php?nothing=12345')
+text = page.read().decode("utf-8")
+discovery = re.search("\d+$", text)
+while(discovery):
+ page = urllib.request.urlopen('http://www.pythonchallenge.com/pc/def/linkedlist.php?nothing={}'.format(discovery.group()))
+ text = page.read().decode("utf-8")
+ discovery = re.search("\d+$", text)
+ print(text)
diff --git a/python/pythonchallenge.py b/python/pythonchallenge.py
@@ -0,0 +1,12 @@
+#g fmnc wms bgblr rpylqjyrc gr zw fylb. rfyrq ufyr amknsrcpq ypc dmp. bmgle gr gl zw fylb gq glcddgagclr ylb rfyr'q ufw rfgq rcvr gq qm jmle. sqgle qrpgle.kyicrpylq() gq pcamkkclbcb. lmu ynnjw ml rfc spj.
+
+#[Bytt ut alle bokstaver med bokstaven to hakk ved siden av]
+sentence = "map."
+test = ""
+for letter in sentence:
+ if letter.isalpha():
+ test += (chr(ord(letter) + 2))
+ else:
+ test += letter
+print test
+
diff --git a/python/qeylogger.py b/python/qeylogger.py
@@ -0,0 +1,21 @@
+from pynput.keyboard import Key, Listener
+
+log = dict()
+
+def on_press(key):
+ if key in log:
+ log[key] += 1
+ else:
+ log[key] = 1
+ if key == Key.print_screen:
+ f = open('keylog.txt', 'w')
+ for key, freq in log.items():
+ f.write("{}: {}\n".format(key, freq))
+ f.close()
+ print(key)
+
+# Collect events until released
+with Listener(on_press=on_press) as listener:
+ listener.join()
+
+
diff --git a/python/tkinter_gui_test.py b/python/tkinter_gui_test.py
@@ -0,0 +1,21 @@
+from Tkinter import *
+
+root = Tk()
+
+def leftClick(event):
+ print event.x, event.y, event.widget
+ event.widget.delete(ALL)
+ event.widget.create_oval(event.x - 3, event.y - 3, event.x + 3, event.y + 3, fill='grey')
+ event.widget.create_line(0, 100, event.x, event.y)
+ event.widget.create_line(event.x, event.y, 200, 0)
+
+
+canvas = Canvas(root, width=200, height=100)
+canvas.pack(side=LEFT)
+
+testline = canvas.create_line(0, 100, 200, 0)
+
+canvas.bind("<Button-1>", leftClick)
+
+# canvas.delete(ALL) # delete entire canvas
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_10.py b/python/tkinter_tutorial_10.py
@@ -0,0 +1,34 @@
+from Tkinter import *
+
+def doNothing():
+ print 'no action tho'
+
+root = Tk()
+
+# ******** Main Menu *******
+
+theMenu = Menu(root)
+root.config(menu=theMenu)
+
+subMenu = Menu(theMenu)
+theMenu.add_cascade(label='file', menu=subMenu)
+subMenu.add_command(label="New item", command=doNothing)
+subMenu.add_command(label="Another one", command=doNothing)
+subMenu.add_separator()
+subMenu.add_command(label='Exit', command=doNothing)
+
+editMenu = Menu(theMenu)
+theMenu.add_cascade(label='Edit', menu=editMenu)
+editMenu.add_command(label="Redo", command=doNothing)
+
+# ******** The Toolbar *******
+
+toolbar = Frame(root, bg="blue")
+insertButt = Button(toolbar, text="Insert Image", command=doNothing)
+insertButt.pack(side=LEFT, padx=2, pady=2) # 2 pix of padding
+printButt = Button(toolbar, text='Print', command=doNothing)
+printButt.pack(side=LEFT, padx=2, pady=2)
+
+toolbar.pack(side=TOP, fill=X)
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_11.py b/python/tkinter_tutorial_11.py
@@ -0,0 +1,39 @@
+from Tkinter import *
+
+def doNothing():
+ print 'no action tho'
+
+root = Tk()
+
+# ******** Main Menu *******
+
+theMenu = Menu(root)
+root.config(menu=theMenu)
+
+subMenu = Menu(theMenu)
+theMenu.add_cascade(label='file', menu=subMenu)
+subMenu.add_command(label="New item", command=doNothing)
+subMenu.add_command(label="Another one", command=doNothing)
+subMenu.add_separator()
+subMenu.add_command(label='Exit', command=doNothing)
+
+editMenu = Menu(theMenu)
+theMenu.add_cascade(label='Edit', menu=editMenu)
+editMenu.add_command(label="Redo", command=doNothing)
+
+# ******** The Toolbar *******
+
+toolbar = Frame(root, bg="blue")
+insertButt = Button(toolbar, text="Insert Image", command=doNothing)
+insertButt.pack(side=LEFT, padx=2, pady=2) # 2 pix of padding
+printButt = Button(toolbar, text='Print', command=doNothing)
+printButt.pack(side=LEFT, padx=2, pady=2)
+
+toolbar.pack(side=TOP, fill=X)
+
+# ******* Status Bar *******
+
+status = Label(root, text="Preparing to do nothing", bd=1, relief=SUNKEN, anchor=W)
+status.pack(side=BOTTOM, fill=X)
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_12.py b/python/tkinter_tutorial_12.py
@@ -0,0 +1,13 @@
+from Tkinter import *
+import tkMessageBox
+
+root = Tk()
+
+tkMessageBox.showinfo('Window Title', 'This is the text in the msg')
+
+answer = tkMessageBox.askquestion('The Question', 'You like dat text?')
+
+if answer == 'yes':
+ print "Dat good ol' text"
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_13.py b/python/tkinter_tutorial_13.py
@@ -0,0 +1,14 @@
+from Tkinter import *
+
+root = Tk()
+
+canvas = Canvas(root, width=200, height=100)
+canvas.pack()
+
+blackLine = canvas.create_line(0, 0, 200, 50)
+redLine = canvas.create_line(0, 100, 200,50, fill='red')
+greenBox = canvas.create_rectangle(25, 25, 130, 60, fill='green')
+
+canvas.delete(redLine)
+# canvas.delete(ALL) # delete entire canvas
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_14.py b/python/tkinter_tutorial_14.py
@@ -0,0 +1,9 @@
+from Tkinter import *
+
+root = Tk()
+
+photo = PhotoImage(file='vodka.png')
+label = Label(root, image=photo)
+label.pack()
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_2.py b/python/tkinter_tutorial_2.py
@@ -0,0 +1,19 @@
+from Tkinter import *
+
+root = Tk()
+topFrame = Frame(root)
+topFrame.pack()
+bottomFrame = Frame(root)
+bottomFrame.pack(side=BOTTOM)
+
+button1 = Button(topFrame, text="Button 1", fg = "red")
+button2 = Button(topFrame, text="Button 2", fg = "blue")
+button3 = Button(topFrame, text="Button 3", fg = "green")
+button4 = Button(bottomFrame, text="Button 4", fg = "purple")
+
+button1.pack(side=LEFT)
+button2.pack(side=LEFT)
+button3.pack(side=LEFT)
+button4.pack(side=BOTTOM)
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_3.py b/python/tkinter_tutorial_3.py
@@ -0,0 +1,12 @@
+from Tkinter import *
+
+root = Tk()
+
+one = Label(root, text="One", bg="red", fg="white")
+one.pack()
+two = Label(root, text="Two", bg="green", fg="black")
+two.pack(fill=X)
+three = Label(root, text="Three", bg="blue", fg="white")
+three.pack(side=LEFT, fill=Y)
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_4.py b/python/tkinter_tutorial_4.py
@@ -0,0 +1,16 @@
+from Tkinter import *
+
+root = Tk()
+
+label_1 = Label(root, text="Name")
+label_2 = Label(root, text="Password")
+entry_1 = Entry(root)
+entry_2 = Entry(root)
+
+label_1.grid(row=0, column = 0)
+label_2.grid(row=1) # column = 0 by default
+
+entry_1.grid(row = 0, column = 1)
+entry_2.grid(row = 1, column = 1)
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_5.py b/python/tkinter_tutorial_5.py
@@ -0,0 +1,19 @@
+from Tkinter import *
+
+root = Tk()
+
+label_1 = Label(root, text="Name")
+label_2 = Label(root, text="Password")
+entry_1 = Entry(root)
+entry_2 = Entry(root)
+
+label_1.grid(row=0, sticky=E) # sticky aligns the text on the grid - NESW (North, East, South West)
+label_2.grid(row=1, sticky=E) # column = 0 by default
+
+entry_1.grid(row = 0, column = 1)
+entry_2.grid(row = 1, column = 1)
+
+c = Checkbutton(root, text="Keep me logged in")
+c.grid(columnspan = 2) # Two column grid
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_6.py b/python/tkinter_tutorial_6.py
@@ -0,0 +1,23 @@
+from Tkinter import *
+
+root = Tk()
+
+def bindedFunc():
+ print 'Tast'
+ return
+
+def printStuff(event):
+ print 'Hello welt'
+ return
+
+#Binding a function to a (button) widget:
+button_1 = Button(root, text="Print Tast", command=bindedFunc)
+
+# Method two:
+button_2 = Button(root, text="Print some stuff")
+button_2.bind("<Button-1>", printStuff)
+
+button_1.pack()
+button_2.pack()
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_7.py b/python/tkinter_tutorial_7.py
@@ -0,0 +1,20 @@
+from Tkinter import *
+
+root = Tk()
+
+def leftClick(event):
+ print 'Left'
+
+def middleClick(event):
+ print 'Middle'
+
+def rightClick(event):
+ print 'Right'
+
+frame = Frame(root, width = 300, height = 250)
+frame.bind("<Button-1>", leftClick)
+frame.bind("<Button-2>", middleClick)
+frame.bind("<Button-3>", rightClick)
+frame.pack()
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_8.py b/python/tkinter_tutorial_8.py
@@ -0,0 +1,22 @@
+from Tkinter import *
+
+class VHButtons:
+ def __init__(self, master): # This is a constructor
+ frame = Frame(master)
+ frame.pack()
+
+ self.printButton = Button(frame, text="Print message", command = self.printMessage)
+ self.printButton.pack(side=LEFT)
+
+ self.quitButton = Button(frame, text="Quit", command=frame.quit)
+ self.quitButton.pack(side=LEFT)
+
+ def printMessage(self):
+ print 'Wow, it actually worked!'
+
+
+root = Tk()
+
+b = VHButtons(root)
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/tkinter_tutorial_9.py b/python/tkinter_tutorial_9.py
@@ -0,0 +1,22 @@
+from Tkinter import *
+
+def doNothing():
+ print 'no action tho'
+
+root = Tk()
+
+theMenu = Menu(root)
+root.config(menu=theMenu)
+
+subMenu = Menu(theMenu)
+theMenu.add_cascade(label='file', menu=subMenu)
+subMenu.add_command(label="New item", command=doNothing)
+subMenu.add_command(label="Another one", command=doNothing)
+subMenu.add_separator()
+subMenu.add_command(label='Exit', command=doNothing)
+
+editMenu = Menu(theMenu)
+theMenu.add_cascade(label='Edit', menu=editMenu)
+editMenu.add_command(label="Redo", command=doNothing)
+
+root.mainloop()+
\ No newline at end of file
diff --git a/python/vodka.png b/python/vodka.png
Binary files differ.
diff --git a/python/ztats.py b/python/ztats.py
@@ -0,0 +1,168 @@
+#!/bin/python
+
+# Work log / statistics script.
+# Replaced by 'wlog', or 'work'...
+
+import sys
+import re
+import json
+import datetime
+from subprocess import call
+
+### TODO ###
+# The 'sloppy' syntax is unnecessarily complicated to implement.
+# Redesign it and stick to the following syntax:
+#
+# add [w=<week>] [d=<day>] <cat> <time><h/m> <info> , [w=<week>] [d=<day>] <newcat> <newtime><h/m> <newinfo>
+############
+
+# Initialize
+datafile = "/home/vh/ntnu/workstats.json"
+stats = []
+cats = []
+currweek = datetime.datetime.now().isocalendar()[1]
+currday = datetime.datetime.now().isocalendar()[2]
+
+
+# Read log file
+with open(datafile, 'r+') as f:
+ txtdata = f.read()
+ if txtdata != "":
+ stats = json.loads(txtdata)
+ for entry in stats:
+ if entry["cat"] not in cats:
+ cats.append(entry["cat"])
+ f.close()
+
+# Available commands
+def add(args):
+ entry = {
+ "week": currweek,
+ "day": currday
+ }
+
+ timescale=1
+ # search for variations of the word 'hours' and set timescale if present:
+ pattern = re.compile("^(\d*)h$|(\d*)hrs|(\d*)hours")
+ for a in args:
+ match = pattern.search(a)
+ if match:
+ timescale=60
+ if match.group(1):
+ entry["time"] = timescale*int(match.group(1))
+ args.remove(a)
+
+ # search for manual overrides of the week or day:
+ pattern = re.compile("(?:week=|w=)(?:(\d+)|last)")
+ for a in args:
+ match = pattern.search(a)
+ if match:
+ print("match {}".format(match.group(0)))
+ print("match {}".format(match.group(1)))
+ if match.group(1) == "last":
+ entry["week"] -= 1
+ else:
+ entry["week"]=match.group(1)
+ args.remove(a)
+ #break
+
+ pattern = re.compile("(?:day=|d=)(\d)+")
+ for a in args:
+ match = pattern.search(a)
+ if match:
+ entry["day"]=match.group(1)
+ args.remove(a)
+ #break
+# The reason for removing the breaks here is that I want the ability to 'override the overrides'
+# When add is called recursively, it is called using w=<previous week> and d=<previous day>,
+# so to be able to override these, I have to read the entire args list and use the last w and d.
+
+ # Search for time, if it is not already set:
+ if "time" not in entry:
+ pattern = re.compile("(\d+)")
+ for a in args:
+ match = pattern.search(a)
+ if match:
+ entry["time"]=timescale*int(match.group(1))
+ args.remove(a)
+ break
+
+ # Use the remaining text as categories and information
+ for i, a in enumerate(args):
+ # If comma present, add new tasks recursively:
+ if a == ",":
+ args.remove(a)
+ print(args[i:])
+ add(["w={}", "d={}".format(entry["week"], entry["day"])]+args[i:])
+ break
+ else:
+ if "cat" not in entry:
+ entry["cat"] = a
+ cats.append(a)
+ if "info" not in entry:
+ entry["info"] = a
+ else:
+ entry["info"] +=" " + a
+ args.remove(a)
+
+ stats.append(entry)
+ print("Entry added for category '{}'.".format(entry["cat"]))
+
+def save(args):
+ with open(datafile, 'w') as f:
+ f.write(json.dumps(stats))
+ f.close()
+
+def date(args):
+ print("Current week: {}".format(currweek))
+ print(datetime.datetime.now())
+
+def raw(args):
+ print(stats)
+
+def clear(args):
+ call(["clear"])
+
+def show(args):
+ time_by_cat = {}
+ # init
+ for c in cats:
+ time_by_cat[c] = 0
+
+ # calculate time spent on each category
+ for entry in stats:
+ time_by_cat[entry["cat"]] += entry["time"]
+
+ print("\nTotal time spent on:")
+ for cat in time_by_cat:
+ print("{:>10}:{:>9.0f}h {}m".format(cat, time_by_cat[cat]//60, time_by_cat[cat]%60))
+
+def hlp(args):
+ print("read the script lol")
+
+def exit(args):
+ with open(datafile, 'w') as f:
+ f.write(json.dumps(stats))
+ f.close()
+
+options = {
+ "add":add,
+ "date":date,
+ "raw":raw,
+ "clear":clear,
+ "save":save,
+ "show":show,
+ "help":hlp,
+ "exit":exit,
+ }
+
+cmd = ""
+
+while(cmd != "exit"):
+ cmd = input("> ")
+ args = cmd.split()
+ if args[0] in options:
+ options[args[0]](args[1:])
+ else:
+ print("Invalid command. Type 'help' for available commands.")
+
