<commit_before>package com.stylepoints.habittracker;

import java.util.ArrayList;
import java.util.List;

/**
 * Created by nikosomos on 2017-10-18.
 */

public class Profile {

    private String username;

    // TODO: Decide whether to use ArrayList, or extend it to HabitList for more functionality
    private List<Habit> habitList;

    Profile(String username) {
        this.username = username;
        habitList = new ArrayList<Habit>();
    }

    public String getUsername() {
        return this.username;
    }

    public void setUsername(String username) {
        this.username = username;
    }

    public void addHabit(Habit habit) {
        habitList.add(habit);
    }

    public void removeHabit(Habit habit) {
        habitList.remove(habit);
    }

    public int findHabit(Habit habit) {
        return habitList.indexOf(habit);
    }

    public int numHabits() {
        return habitList.size();
    }

}<commit_msg>fix profile merge conflict<commit_after>package com.stylepoints.habittracker;

import java.util.ArrayList;
import java.util.List;

/**
 * Created by nikosomos on 2017-10-18.
 */

public class Profile {

    private String username;

    // TODO: Decide whether to use ArrayList, or extend it to HabitList for more functionality
    private List<Habit> habitList;

    Profile(String username) {
        this.username = username;
        habitList = new ArrayList<Habit>();
    }

    public String getUsername() {
        return this.username;
    }

    public void setUsername(String username) {
        this.username = username;
    }

    public void addHabit(Habit habit) {
        habitList.add(habit);
    }

    public void removeHabit(Habit habit) {
        habitList.remove(habit);
    }

    public int findHabit(Habit habit) {
        return habitList.indexOf(habit);
    }

    public int numHabits() {
        return habitList.size();
    }
}
{'fraction_non_alphanumeric': 0.09368421052631579, 'fraction_numerical': 0.008421052631578947, 'mean_word_length': 2.6072106261859584, 'pattern_counts': {'":': 0, '<': 7, '<?xml version=': 0, '>': 7, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '6441612', 'n_tokens_mistral': 599, 'n_tokens_neox': 557, 'n_words': 149}