diff --git a/Android-StepsView.iml b/Android-StepsView.iml
new file mode 100644
index 0000000..7e6f436
--- /dev/null
+++ b/Android-StepsView.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/EcoBici.ipynb b/EcoBici.ipynb
new file mode 100644
index 0000000..a55baaa
--- /dev/null
+++ b/EcoBici.ipynb
@@ -0,0 +1,69 @@
+{
+ "nbformat": 4,
+ "nbformat_minor": 0,
+ "metadata": {
+ "colab": {
+ "provenance": [],
+ "authorship_tag": "ABX9TyP4XGyrilX2cVbPO1tG0zd8",
+ "include_colab_link": true
+ },
+ "kernelspec": {
+ "name": "python3",
+ "display_name": "Python 3"
+ },
+ "language_info": {
+ "name": "python"
+ }
+ },
+ "cells": [
+ {
+ "cell_type": "markdown",
+ "metadata": {
+ "id": "view-in-github",
+ "colab_type": "text"
+ },
+ "source": [
+ "![\"Open](\"https://colab.research.google.com/assets/colab-badge.svg\")
"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "source": [
+ "## Testing for time series machine learning method"
+ ],
+ "metadata": {
+ "id": "a6TH3Bmurpgh"
+ }
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "id": "Mqs9mXBdrYmY"
+ },
+ "outputs": [],
+ "source": [
+ "import datetime\n",
+ "import random\n",
+ "import numpy as np\n",
+ "import pandas as pd\n",
+ "import matplotlib.pyplot as plt\n",
+ "import matplotlib.dates as mdates\n",
+ "import seaborn as sns\n",
+ "import statmodels.api as sm\n",
+ "\n",
+ "from scipy import stats\n",
+ "from functions import partial\n",
+ "from sklearn.metrics import {\n",
+ " mean_absolute_error,\n",
+ " mean_squared_error,\n",
+ " mean_absolute_percentage_error,\n",
+ "}\n",
+ "\n",
+ "sns.set()\n",
+ "\n",
+ "%matplotlib inline"
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 14a2e7f..2ba4c2e 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,10 +12,7 @@
-
-
- generateDebugAndroidTestSources
generateDebugSources
@@ -28,21 +25,23 @@
-
+
+
-
+
+
-
+
@@ -50,6 +49,15 @@
+
+
+
+
+
+
+
+
+
@@ -57,6 +65,7 @@
+
@@ -64,35 +73,47 @@
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
+
+
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2b23a9b..ea66169 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
+
+
+ android:configChanges="orientation|screenSize">
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fddf32a..ae47b1c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -2,7 +2,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
diff --git a/build.gradle b/build.gradle
index 9405f3f..f46d653 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.2.3'
+ classpath 'com.android.tools.build:gradle:2.2.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 55e8e03..44550fa 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 22 10:06:50 WIT 2015
+#Tue Jan 03 15:22:50 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 4cbb14b..c0ac2a7 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -23,4 +23,4 @@ dependencies {
compile 'com.android.support:appcompat-v7:22.2.0'
}
-apply from: '../maven_push.gradle'
+//apply from: '../maven_push.gradle'
diff --git a/library/library.iml b/library/library.iml
index b9a24e1..c2a59e8 100644
--- a/library/library.iml
+++ b/library/library.iml
@@ -12,10 +12,7 @@
-
-
- generateDebugAndroidTestSources
generateDebugSources
@@ -29,21 +26,23 @@
-
+
+
-
+
+
-
+
@@ -51,6 +50,15 @@
+
+
+
+
+
+
+
+
+
@@ -58,6 +66,15 @@
+
+
+
+
+
+
+
+
+
@@ -65,34 +82,33 @@
-
-
+
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
-
+
+
-
+
+
\ No newline at end of file
diff --git a/library/src/main/java/com/anton46/stepsview/StepsView.java b/library/src/main/java/com/anton46/stepsview/StepsView.java
index 9b17110..22869fb 100644
--- a/library/src/main/java/com/anton46/stepsview/StepsView.java
+++ b/library/src/main/java/com/anton46/stepsview/StepsView.java
@@ -11,6 +11,7 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import java.util.ArrayList;
import java.util.List;
@@ -114,6 +115,8 @@ public void onReady() {
private void drawLabels() {
List indicatorPosition = mStepsViewIndicator.getThumbContainerXPosition();
+ mLabelsLayout.removeAllViews();
+
if (mLabels != null) {
for (int i = 0; i < mLabels.length; i++) {
TextView textView = new TextView(getContext());
diff --git a/library/src/main/java/com/anton46/stepsview/StepsViewIndicator.java b/library/src/main/java/com/anton46/stepsview/StepsViewIndicator.java
index 26d7975..6a0e286 100644
--- a/library/src/main/java/com/anton46/stepsview/StepsViewIndicator.java
+++ b/library/src/main/java/com/anton46/stepsview/StepsViewIndicator.java
@@ -85,6 +85,7 @@ public void onSizeChanged(int w, int h, int oldw, int oldh) {
mRightY = 0.5f * (getHeight() + mLineHeight);
mDelta = (mRightX - mLeftX) / (mNumOfStep - 1);
+ mThumbContainerXPosition.clear();
mThumbContainerXPosition.add(mLeftX);
for (int i = 1; i < mNumOfStep - 1; i++) {
mThumbContainerXPosition.add(mLeftX + (i * mDelta));